summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2012-11-01 13:32:01 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2012-11-01 13:32:01 +0000
commit2e5015bdae926c757111bfd6c3b1720756e582be (patch)
treebfeb6c984c66e5ea715a0f62dcc55cefa7c1cf1a /qpid/java
parent1034d59bd40660ea35f4c7209ab6938f5049c12d (diff)
downloadqpid-python-2e5015bdae926c757111bfd6c3b1720756e582be.tar.gz
QPID-4408 Applying patch from Dejan Bosanac.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1404586 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
index bfd3029ace..28aacc3f44 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
@@ -282,7 +282,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect
{
task.onClose();
}
- if(_state != State.UNCONNECTED ) {
+ if(_conn != null && _state != State.UNCONNECTED ) {
_conn.close();
}
_state = State.CLOSED;