diff options
Diffstat (limited to 'java/client')
4 files changed, 6 insertions, 4 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java index bde60c433f..e741d4071c 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java @@ -152,7 +152,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Closed { if (_logger.isDebugEnabled()) { - _logger.debug("Received a connection close from the broker: Error code : " + errorCode.getCode()); + _logger.debug("Received a connection close from the broker: Error code : " + errorCode.getCode(), t); } if (_conn._exceptionListener != null) { diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java index 17b7486fb7..e43072422c 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java @@ -210,8 +210,7 @@ public class AMQSession_0_10 extends AMQSession public void sendClose(long timeout) throws AMQException, FailoverException { getQpidSession().sync(); - getQpidSession().sessionRequestTimeout(0); - getQpidSession().sessionDetach(getQpidSession().getName()); + getQpidSession().close(); getCurrentException(); } diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java index 5b45387be3..9fb4c541a9 100644 --- a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java +++ b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java @@ -21,6 +21,7 @@ package org.apache.qpidity.nclient; import java.util.List; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; @@ -266,7 +267,7 @@ public class Client implements org.apache.qpidity.nclient.Connection closeOk.await(timeout - elapsed, TimeUnit.MILLISECONDS); elapsed = System.currentTimeMillis() - start; } - if(! closed ) + if(!closed) { throw new QpidException("Timed out when closing connection", ErrorCode.CONNECTION_ERROR, null); } diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java b/java/client/src/main/java/org/apache/qpidity/nclient/Session.java index 833a26da87..c4d80e0fee 100644 --- a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java +++ b/java/client/src/main/java/org/apache/qpidity/nclient/Session.java @@ -63,6 +63,8 @@ public interface Session */ public void sync(); + public void close(); + public void sessionDetach(byte[] name); public void sessionRequestTimeout(long expiry); |