cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r811050 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/
Date Thu, 03 Sep 2009 17:30:09 GMT
Author: dkulp
Date: Thu Sep  3 17:30:08 2009
New Revision: 811050

URL: http://svn.apache.org/viewvc?rev=811050&view=rev
Log:
Merged revisions 811045 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

........
  r811045 | dkulp | 2009-09-03 13:20:40 -0400 (Thu, 03 Sep 2009) | 1 line
  
  Some thread safety issues in JMSConduit
........

Added:
    cxf/branches/2.1.x-fixes/.gitignore
      - copied unchanged from r811045, cxf/branches/2.2.x-fixes/.gitignore
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/JMSConduit.java
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  3 17:30:08 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016,811045
 /cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526,810927,811013

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/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=811050&r1=811049&r2=811050&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Thu Sep  3 17:30:08 2009
@@ -53,6 +53,7 @@
 import org.springframework.jms.connection.SingleConnectionFactory;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
+import org.springframework.jms.listener.AbstractMessageListenerContainer;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 import org.springframework.jms.support.JmsUtils;
 
@@ -76,9 +77,14 @@
     private String conduitId;
     private AtomicLong messageCount;
     private JMSBusLifeCycleListener listener;
+    private Bus bus;
 
-    public JMSConduit(EndpointInfo endpointInfo, EndpointReferenceType target, JMSConfiguration
jmsConfig) {
+    public JMSConduit(EndpointInfo endpointInfo, 
+                      EndpointReferenceType target, 
+                      JMSConfiguration jmsConfig,
+                      Bus b) {
         super(target);
+        bus = b;
         this.jmsConfig = jmsConfig;
         this.endpointInfo = endpointInfo;
         correlationMap = new ConcurrentHashMap<String, Exchange>();
@@ -100,6 +106,29 @@
         JMSOutputStream out = new JMSOutputStream(this, message.getExchange(), isTextPayload);
         message.setContent(OutputStream.class, out);
     }
+    
+    private synchronized AbstractMessageListenerContainer getJMSListener() {
+        if (jmsListener == null) {
+            jmsListener = JMSFactory.createJmsListener(jmsConfig, this, 
+                                                       jmsConfig.getReplyDestination(), 
+                                                       conduitId, 
+                                                       false);
+            addBusListener();
+        }
+        return jmsListener;
+    }
+    private synchronized AbstractMessageListenerContainer getAllListener() {
+        if (allListener == null) {
+            allListener = JMSFactory.createJmsListener(jmsConfig, 
+                                                       this, 
+                                                       jmsConfig.getReplyDestination(), 
+                                                       null, 
+                                                       true);
+            addBusListener();
+        }
+        
+        return allListener;
+    }
 
     /**
      * Send the JMS Request out and if not oneWay receive the response
@@ -130,27 +159,12 @@
 
         final JmsTemplate jmsTemplate = JMSFactory.createJmsTemplate(jmsConfig, headers);
         String userCID = headers != null ? headers.getJMSCorrelationID() : null;
-        DefaultMessageListenerContainer jmsList = jmsListener;
+        AbstractMessageListenerContainer jmsList = jmsListener;
         if (!exchange.isOneWay()) {
             if (userCID == null || !jmsConfig.isUseConduitIdSelector()) { 
-                if (jmsListener == null) {
-                    jmsListener = JMSFactory.createJmsListener(jmsConfig, this, 
-                                                               jmsConfig.getReplyDestination(),

-                                                               conduitId, 
-                                                               false);
-                    addBusListener(exchange.get(Bus.class));
-                }
-                jmsList = jmsListener;
+                jmsList = getJMSListener();
             } else {
-                if (allListener == null) {
-                    allListener = JMSFactory.createJmsListener(jmsConfig, 
-                                                               this, 
-                                                               jmsConfig.getReplyDestination(),

-                                                               null, 
-                                                               true);
-                    addBusListener(exchange.get(Bus.class));
-                }
-                jmsList = allListener;
+                jmsList = getAllListener();
             }
         }
         
@@ -245,7 +259,7 @@
             }
         }
     }
-    private synchronized void addBusListener(Bus bus) {
+    private synchronized void addBusListener() {
         if (listener == null && bus != null) {
             BusLifeCycleManager blcm = bus.getExtension(BusLifeCycleManager.class);
             if (blcm != null) {

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java?rev=811050&r1=811049&r2=811050&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
Thu Sep  3 17:30:08 2009
@@ -63,7 +63,7 @@
     public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType target) throws
IOException {
         JMSOldConfigHolder old = new JMSOldConfigHolder();
         JMSConfiguration jmsConf = old.createJMSConfigurationFromEndpointInfo(bus, endpointInfo,
true);
-        return new JMSConduit(endpointInfo, target, jmsConf);
+        return new JMSConduit(endpointInfo, target, jmsConf, bus);
     }
 
     /**

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?rev=811050&r1=811049&r2=811050&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
Thu Sep  3 17:30:08 2009
@@ -117,7 +117,7 @@
         
         JMSConfiguration jmsConfig = new JMSOldConfigHolder()
             .createJMSConfigurationFromEndpointInfo(bus, endpointInfo, true);
-        JMSConduit jmsConduit = new JMSConduit(endpointInfo, target, jmsConfig);
+        JMSConduit jmsConduit = new JMSConduit(endpointInfo, target, jmsConfig, bus);
         if (send) {
             // setMessageObserver
             observer = new MessageObserver() {



Mime
View raw message