summaryrefslogtreecommitdiff
path: root/qpid/java/jca
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2012-01-10 16:07:07 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2012-01-10 16:07:07 +0000
commitcb12024506a54fe2cf4249624a1a5408db3d966b (patch)
treec282f58dba767a286450444b02cb4d2202fb6ee1 /qpid/java/jca
parent44e5b08cd17d40c20c11297caf4812acb58a1a93 (diff)
downloadqpid-python-cb12024506a54fe2cf4249624a1a5408db3d966b.tar.gz
QPID-3705, committing patch by Weston Price.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229618 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/jca')
-rw-r--r--qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
index 98427d7f9d..d8accad153 100644
--- a/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
@@ -113,6 +113,9 @@ public class QpidActivation implements ExceptionListener
// Whether we are in the failure recovery loop
private AtomicBoolean _inFailure = new AtomicBoolean(false);
+ //Whether or not we have completed activating
+ private AtomicBoolean _activated = new AtomicBoolean(false);
+
static
{
try
@@ -323,8 +326,10 @@ public class QpidActivation implements ExceptionListener
throw e;
}
}
+
amqConnection.start() ;
this._connection = amqConnection ;
+ _activated.set(true);
_log.debug("Setup complete " + this);
}
@@ -422,7 +427,6 @@ public class QpidActivation implements ExceptionListener
" of type " +
destinationType.getName());
_destination = Util.lookup(ctx, destinationName, destinationType);
- //_destination = (Destination)ctx.lookup(destinationName);
}
else
@@ -490,7 +494,14 @@ public class QpidActivation implements ExceptionListener
public void onException(final JMSException jmse)
{
- handleFailure(jmse) ;
+ if(_activated.get())
+ {
+ handleFailure(jmse) ;
+ }
+ else
+ {
+ _log.warn("Received JMSException: " + jmse + " while endpoint was not activated.");
+ }
}
/**