You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/09/29 23:44:21 UTC
svn commit: r820100 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Author: dkulp
Date: Tue Sep 29 21:44:20 2009
New Revision: 820100
URL: http://svn.apache.org/viewvc?rev=820100&view=rev
Log:
Merged revisions 820097 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r820097 | dkulp | 2009-09-29 17:40:47 -0400 (Tue, 29 Sep 2009) | 10 lines
Merged revisions 820095 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r820095 | dkulp | 2009-09-29 17:35:32 -0400 (Tue, 29 Sep 2009) | 2 lines
[CXF-2391] Add ability to set the number of continuations at which point
jms will reconnect.
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=820100&r1=820099&r2=820100&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Tue Sep 29 21:44:20 2009
@@ -70,6 +70,7 @@
private int maxConcurrentConsumers = 1;
private int maxConcurrentTasks = 10;
private int maxSuspendedContinuations = DEFAULT_VALUE;
+ private int reconnectSuspendedContinuations = DEFAULT_VALUE;
private volatile String messageSelector;
private boolean subscriptionDurable;
@@ -334,6 +335,14 @@
public void setMaxSuspendedContinuations(int maxSuspendedContinuations) {
this.maxSuspendedContinuations = maxSuspendedContinuations;
}
+
+ public int getReconnectSuspendedContinuations() {
+ return reconnectSuspendedContinuations;
+ }
+
+ public void setReconnectSuspendedContinuations(int reconnectSuspendedContinuations) {
+ this.reconnectSuspendedContinuations = reconnectSuspendedContinuations;
+ }
public TaskExecutor getTaskExecutor() {
return taskExecutor;
Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java?rev=820100&r1=820099&r2=820100&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java Tue Sep 29 21:44:20 2009
@@ -164,10 +164,10 @@
modifyList(remove);
if (continuations.size() >= jmsConfig.getMaxSuspendedContinuations()) {
jmsListener.stop();
- } else {
- if (!jmsListener.isRunning()) {
- jmsListener.start();
- }
+ } else if (!jmsListener.isRunning()
+ && (jmsConfig.getReconnectSuspendedContinuations() < 0
+ || continuations.size() <= jmsConfig.getReconnectSuspendedContinuations())) {
+ jmsListener.start();
}
}