Author: sagara
Date: Tue Feb 28 12:46:26 2012
New Revision: 1294625
URL: http://svn.apache.org/viewvc?rev=1294625&view=rev
Log:
Applied patch for TRANSPORTS-35.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=1294625&r1=1294624&r2=1294625&view=diff
==============================================================================
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Tue Feb 28 12:46:26 2012
@@ -144,6 +144,9 @@ public class ServiceTaskManager {
/** The JMS Connection shared between multiple polling tasks - when
enabled (reccomended) */
private Connection sharedConnection = null;
+ /** Is this error triggers a JMS onException ?*/
+ private volatile boolean isOnExceptionError = false;
+
/**
* Start or re-start the Task Manager by shutting down any existing worker
tasks and
* re-creating them. However, if this is STM is PAUSED, a start request is
ignored.
@@ -464,9 +467,13 @@ public class ServiceTaskManager {
synchronized(pollingTasks) {
pollingTasks.remove(this);
}
-
- // My time is up, so if I am going away, create another
- scheduleNewTaskIfAppropriate();
+
+ // if this is a JMS onException,
ServiceTaskManager#onException will schedule
+ // a new polling task
+ if (!isOnExceptionError) {
+ // My time is up, so if I am going away, create another
+ scheduleNewTaskIfAppropriate();
+ }
}
}
@@ -592,6 +599,8 @@ public class ServiceTaskManager {
*/
public void onException(JMSException j) {
+ isOnExceptionError = true;
+
if (!isSTMActive()) {
requestShutdown();
return;
@@ -631,9 +640,9 @@ public class ServiceTaskManager {
}
if (!connected) {
+ retryDuration = (long) (retryDuration *
reconnectionProgressionFactor);
log.error("Reconnection attempt : " + (r++) + " for
service : " + serviceName +
" failed. Next retry in " + (retryDuration/1000) +
"seconds");
- retryDuration = (long) (retryDuration *
reconnectionProgressionFactor);
if (retryDuration > maxReconnectDuration) {
retryDuration = maxReconnectDuration;
}
@@ -641,6 +650,10 @@ public class ServiceTaskManager {
try {
Thread.sleep(retryDuration);
} catch (InterruptedException ignore) {}
+ } else {
+ isOnExceptionError = false;
+ log.info("Reconnection attempt: " + r + " for service: " +
serviceName +
+ " was successful!");
}
} while (!isSTMActive() || getConnectedTaskCount() <
concurrentConsumers);
