Author: kwall
Date: Thu Jan 29 22:13:14 2015
New Revision: 1655877
URL: http://svn.apache.org/r1655877
Log:
QPID-6350: [Java Client] Preserve original connection exception
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1655877&r1=1655876&r2=1655877&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
Thu Jan 29 22:13:14 2015
@@ -537,16 +537,16 @@ public class Connection extends Connecti
connectionLost.set(true);
synchronized (lock)
{
- if(log.isDebugEnabled())
- {
- log.debug("exception: %s state : %s", e.getMessage(), state);
- }
+ log.error(e, "exception: %s", e.getMessage());
switch (state)
{
case OPENING:
case CLOSING:
- error = e;
+ if (error == null)
+ {
+ error = e;
+ }
lock.notifyAll();
return;
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java?rev=1655877&r1=1655876&r2=1655877&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
Thu Jan 29 22:13:14 2015
@@ -187,7 +187,10 @@ public class SSLReceiver implements Rece
}
catch(SSLException e)
{
- log.error(e, "Error caught in SSLReceiver");
+ if (log.isDebugEnabled())
+ {
+ log.debug(e, "Error caught in SSLReceiver");
+ }
_sslStatus.setSslErrorFlag();
synchronized(_sslStatus.getSslLock())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
