From 050ccae5ceb3f9b077a797326b3ff604bf91a0b5 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Wed, 4 Feb 2015 16:53:40 +0000
Subject: QPID-6350: [Java Client] Partial revert of r1655877.

My solution was not solving the problem in all situations

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657312 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/transport/Connection.java    | 10 +++++-----
 .../qpid/transport/network/security/ssl/SSLReceiver.java       |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'qpid/java/common/src')

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index 245f12ad0b..890aeda11b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -537,16 +537,16 @@ public class Connection extends ConnectionInvoker
         connectionLost.set(true);
         synchronized (lock)
         {
-            log.error(e, "exception: %s", e.getMessage());
+            if(log.isDebugEnabled())
+            {
+                log.debug("exception: %s state : %s", e.getMessage(), state);
+            }
 
             switch (state)
             {
             case OPENING:
             case CLOSING:
-                if (error == null)
-                {
-                    error = e;
-                }
+                error = e;
                 lock.notifyAll();
                 return;
             }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
index 8e1395aa83..1bbf166d82 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
@@ -187,10 +187,7 @@ public class SSLReceiver implements Receiver<ByteBuffer>
             }
             catch(SSLException e)
             {
-                if (log.isDebugEnabled())
-                {
-                    log.debug(e, "Error caught in SSLReceiver");
-                }
+                log.error(e, "Error caught in SSLReceiver");
                 _sslStatus.setSslErrorFlag();
                 synchronized(_sslStatus.getSslLock())
                 {
-- 
cgit v1.2.1