cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ulhasbh...@apache.org
Subject svn commit: r672744 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/common/util/ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ systests/src/test/java/org/apache/cxf/systest/jms/
Date Mon, 30 Jun 2008 11:22:40 GMT
Author: ulhasbhole
Date: Mon Jun 30 04:22:40 2008
New Revision: 672744

URL: http://svn.apache.org/viewvc?rev=672744&view=rev
Log:
* Fixed issue related to session pooling for JIRA : https://issues.apache.org/jira/browse/CXF-1676

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/AbstractTwoStageCache.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/PooledSession.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/AbstractTwoStageCache.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/AbstractTwoStageCache.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/AbstractTwoStageCache.java
(original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/AbstractTwoStageCache.java
Mon Jun 30 04:22:40 2008
@@ -40,7 +40,6 @@
  * the outer class is initialized).
  * <p>
  *
- * @author Eoghan Glynn
  */
 public abstract class AbstractTwoStageCache<E> {
     private Object mutex;

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Mon Jun 30 04:22:40 2008
@@ -106,7 +106,7 @@
                 isOneWay = ex.isOneWay();
             }    
             //get the pooledSession with response expected 
-            PooledSession pooledSession = base.sessionFactory.get(!isOneWay);           

+            PooledSession pooledSession = base.sessionFactory.get(!isOneWay);
             // put the PooledSession into the outMessage
             message.put(JMSConstants.JMS_POOLEDSESSION, pooledSession);
             

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
Mon Jun 30 04:22:40 2008
@@ -41,7 +41,6 @@
  * static methods, but the intention is to support in future sharing
  * of JMS resources accross compatible ports.
  *
- * @author Eoghan Glynn
  */
 public final class JMSProviderHub {
 

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
Mon Jun 30 04:22:40 2008
@@ -97,7 +97,6 @@
  * reply-capable cache as necessary.
  * <p>
  *
- * @author Eoghan Glynn
  */
 public class JMSSessionFactory {
 
@@ -253,6 +252,12 @@
                             selector = "JMSCorrelationID = '" + generateUniqueSelector(ret)
+ "'";
                         }
                         
+                        if (destination == null) {
+                            //neither replyDestination not replyDest are present.
+                            destination = session.createTemporaryQueue();
+                            selector = "JMSCorrelationID = '" + generateUniqueSelector(ret)
+ "'";
+                        }
+                        
                         ret.destination(destination);
                         MessageConsumer consumer = session.createReceiver(destination, selector);
                         ret.consumer(consumer);

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/PooledSession.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/PooledSession.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/PooledSession.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/PooledSession.java
Mon Jun 30 04:22:40 2008
@@ -35,7 +35,6 @@
  * though the intention is to genericize this to the pub-sub domain
  * also.
  *
- * @author Eoghan Glynn
  */
 public class PooledSession {
     private final Session theSession;

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=672744&r1=672743&r2=672744&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Mon
Jun 30 04:22:40 2008
@@ -100,11 +100,16 @@
         try {
             Greeter greeter = service.getPort(portName, Greeter.class);
             for (int idx = 0; idx < 5; idx++) {
+
+                greeter.greetMeOneWay("test String");
+                
                 String greeting = greeter.greetMe("Milestone-" + idx);
                 assertNotNull("no response received from service", greeting);
                 String exResponse = response1 + idx;
                 assertEquals(exResponse, greeting);
 
+
+                
                 String reply = greeter.sayHi();
                 assertNotNull("no response received from service", reply);
                 assertEquals(response2, reply);



Mime
View raw message