Improved packet timeout logic.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2501 b35dd754-fafc-0310-a699-88a17e54d16e

source/org/jivesoftware/smack/PacketReader.java

@@ -154,7 +154,9 @@ class PacketReader {
                             break;
                         }
                         connectionIDLock.wait(waitTime);
-                        waitTime -= System.currentTimeMillis() - start;
+                        long now = System.currentTimeMillis();
+                        waitTime -= now - start;
+                        start = now;
                     }
                 }
             }

source/org/jivesoftware/smack/XMPPConnection.java

@@ -459,7 +459,9 @@ public class XMPPConnection {
                             break;
                         }
                         roster.wait(waitTime);
-                        waitTime -= System.currentTimeMillis() - start;
+                        long now = System.currentTimeMillis();
+                        waitTime -= now - start;
+                        start = now;
                     }
                 }
             }