Index: source/org/jivesoftware/smack/PacketReader.java
===================================================================
RCS file: /cvs-org/smack/source/org/jivesoftware/smack/PacketReader.java,v
retrieving revision 1.45
diff -u -r1.45 PacketReader.java
--- source/org/jivesoftware/smack/PacketReader.java	2 Nov 2004 23:53:22 -0000	1.45
+++ source/org/jivesoftware/smack/PacketReader.java	26 Dec 2004 19:23:46 -0000
@@ -152,7 +152,9 @@
         // giving up and throwing an error.
         try {
             synchronized(connectionIDLock) {
-                connectionIDLock.wait(SmackConfiguration.getPacketReplyTimeout());
+                if (connectionID == null) {
+                    connectionIDLock.wait(SmackConfiguration.getPacketReplyTimeout());
+                }
             }
         }
         catch (InterruptedException ie) { }
@@ -262,8 +264,8 @@
                             for (int i=0; i<parser.getAttributeCount(); i++) {
                                 if (parser.getAttributeName(i).equals("id")) {
                                     // Save the connectionID and notify that we've gotten it.
-                                    connectionID = parser.getAttributeValue(i);
                                     synchronized(connectionIDLock) {
+                                        connectionID = parser.getAttributeValue(i);
                                         connectionIDLock.notifyAll();
                                     }
                                 }