Fixed deadlock. JM-282

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

src/java/org/jivesoftware/messenger/net/SocketConnection.java

@@ -187,7 +187,9 @@ public class SocketConnection implements Connection {
         this.flashClient = flashClient;
     }
 
-    public synchronized void close() {
+    public void close() {
+        boolean wasClosed = false;
+        synchronized (this) {
             if (!isClosed()) {
                 try {
                     if (session != null) {
@@ -215,6 +217,10 @@ public class SocketConnection implements Connection {
                     Log.error(LocaleUtils.getLocalizedString("admin.error.close")
                             + "\n" + this.toString(), e);
                 }
+                wasClosed = true;
+            }
+        }
+        if (wasClosed) {
             notifyCloseListeners();
         }
     }
@@ -227,6 +233,7 @@ public class SocketConnection implements Connection {
             try {
                 // Invoke the interceptors before we send the packet
                 InterceptorManager.getInstance().invokeInterceptors(packet, session, false, false);
+                boolean errorDelivering = false;
                 synchronized (writer) {
                     try {
                         xmlSerializer.write(packet.getElement());
@@ -236,18 +243,23 @@ public class SocketConnection implements Connection {
                         xmlSerializer.flush();
                     }
                     catch (IOException e) {
-                        Log.warn(LocaleUtils.getLocalizedString("admin.error.close")
+                        Log.debug(LocaleUtils.getLocalizedString("admin.error.close")
                         + "\n" + this.toString(), e);
+                        errorDelivering = true;
+                    }
+                }
+                if (errorDelivering) {
                     close();
                     // Retry sending the packet again. Most probably if the packet is a
                     // Message it will be stored offline
                     deliverer.deliver(packet);
                 }
-                }
+                else {
                     // Invoke the interceptors after we have sent the packet
                     InterceptorManager.getInstance().invokeInterceptors(packet, session, false, true);
                     session.incrementServerPacketCount();
                 }
+            }
             catch (PacketRejectedException e) {
                 // An interceptor rejected the packet so do nothing
             }