You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/10/05 13:48:44 UTC

svn commit: r1394457 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java

Author: robbie
Date: Fri Oct  5 11:48:43 2012
New Revision: 1394457

URL: http://svn.apache.org/viewvc?rev=1394457&view=rev
Log:
QPID-4359: stop logging spurious error messages (when caused by expected behaviour of an SSLSocket) during closure of a connection using SSL

Modified:
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1394457&r1=1394456&r2=1394457&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Fri Oct  5 11:48:43 2012
@@ -161,10 +161,7 @@ final class IoReceiver implements Runnab
         }
         catch (Throwable t)
         {
-            if (!(shutdownBroken &&
-                  t instanceof SocketException &&
-                  t.getMessage().equalsIgnoreCase("socket closed") &&
-                  closed.get()))
+            if (shouldReport(t))
             {
                 receiver.exception(t);
             }
@@ -183,4 +180,19 @@ final class IoReceiver implements Runnab
         }
     }
 
+    private boolean shouldReport(Throwable t)
+    {
+        boolean brokenClose = closed.get() &&
+                              shutdownBroken &&
+                              t instanceof SocketException &&
+                              "socket closed".equalsIgnoreCase(t.getMessage());
+
+        boolean sslSocketClosed = closed.get() &&
+                                  socket instanceof SSLSocket &&
+                                  t instanceof SocketException &&
+                                  "Socket is closed".equalsIgnoreCase(t.getMessage());
+
+        return !brokenClose && !sslSocketClosed;
+    }
+
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org