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/10/05 23:47:57 UTC
svn commit: r822036 - in /cxf/branches/2.2.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/JMSOldConfigHolder.java
Author: dkulp
Date: Mon Oct 5 21:47:56 2009
New Revision: 822036
URL: http://svn.apache.org/viewvc?rev=822036&view=rev
Log:
Merged revisions 822030 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r822030 | dkulp | 2009-10-05 17:37:48 -0400 (Mon, 05 Oct 2009) | 1 line
Remove unused property and map the old session pool stuff in correctly
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=822036&r1=822035&r2=822036&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Mon Oct 5 21:47:56 2009
@@ -68,7 +68,6 @@
private int concurrentConsumers = 1;
private int maxConcurrentConsumers = 1;
- private int maxConcurrentTasks = 10;
private int maxSuspendedContinuations = DEFAULT_VALUE;
private int reconnectPercentOfMax = 70;
@@ -365,14 +364,6 @@
public boolean isSetUseConduitIdSelector() {
return useConduitIdSelector != null;
}
-
- public int getMaxConcurrentTasks() {
- return maxConcurrentTasks;
- }
-
- public void setMaxConcurrentTasks(int maxConcurrentTasks) {
- this.maxConcurrentTasks = maxConcurrentTasks;
- }
public void setJndiTemplate(JndiTemplate jndiTemplate) {
this.jndiTemplate = jndiTemplate;
Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=822036&r1=822035&r2=822036&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Mon Oct 5 21:47:56 2009
@@ -109,7 +109,10 @@
jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName());
jmsConfig.setDurableSubscriptionClientId(serverConfig.getDurableSubscriptionClientId());
if (sessionPool.isSetHighWaterMark()) {
- jmsConfig.setMaxConcurrentTasks(sessionPool.getHighWaterMark());
+ jmsConfig.setMaxConcurrentConsumers(sessionPool.getHighWaterMark());
+ }
+ if (sessionPool.isSetLowWaterMark()) {
+ jmsConfig.setConcurrentConsumers(sessionPool.getLowWaterMark());
}
long timeToLive = isConduit ? clientConfig.getMessageTimeToLive() : serverConfig
.getMessageTimeToLive();
@@ -212,4 +215,5 @@
}
return env;
}
+
}