Author: dkulp Date: Tue Oct 6 01:20:20 2009 New Revision: 822101 URL: http://svn.apache.org/viewvc?rev=822101&view=rev Log: Merged revisions 822036 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r822036 | dkulp | 2009-10-05 17:47:56 -0400 (Mon, 05 Oct 2009) | 9 lines 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.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/JMSOldConfigHolder.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=822101&r1=822100&r2=822101&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 Oct 6 01:20:20 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.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=822101&r1=822100&r2=822101&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Tue Oct 6 01:20:20 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; } + }
