svn commit: r1140991 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

[dkulp]

Author: dkulp
Date: Wed Jun 29 08:09:25 2011
New Revision: 1140991

URL: http://svn.apache.org/viewvc?rev=1140991&view=rev
Log:
Merged revisions 1139351 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1139351 | cschneider | 2011-06-24 11:13:26 -0400 (Fri, 24 Jun 2011) | 1 line
  
  CXF-3618 removing maybeShutdownListeners as it was affecting performance 
really badly
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=1140991&r1=1140990&r2=1140991&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
 Wed Jun 29 08:09:25 2011
@@ -47,7 +47,6 @@ import org.apache.cxf.message.MessageImp
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.AbstractConduit;
-import org.apache.cxf.workqueue.WorkQueueManager;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
@@ -74,7 +73,6 @@ public class JMSConduit extends Abstract
     private DefaultMessageListenerContainer allListener;
     private String conduitId;
     private AtomicLong messageCount;
-    private int outstandingAsync;
     private JMSBusLifeCycleListener listener;
     private Bus bus;
 
@@ -114,7 +112,6 @@ public class JMSConduit extends Abstract
                                                        false);
             addBusListener();
         }
-        ++outstandingAsync;
         return jmsListener;
     }
     private synchronized AbstractMessageListenerContainer getAllListener() {
@@ -126,7 +123,6 @@ public class JMSConduit extends Abstract
                                                        true);
             addBusListener();
         }
-        ++outstandingAsync;
         return allListener;
     }
 
@@ -348,24 +344,6 @@ public class JMSConduit extends Abstract
             return;
         }
         doReplyMessage(exchange, jmsMessage);
-        maybeShutdownListeners();
-    }
-    private synchronized void maybeShutdownListenersInternal() {
-        if (outstandingAsync == 0) {
-            shutdownListeners();
-        }        
-    }
-    private synchronized void maybeShutdownListeners() {
-        if (outstandingAsync > 0) {
-            --outstandingAsync;
-        }
-        if (outstandingAsync == 0) {
-            
bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue().execute(new 
Runnable() {
-                public void run() {
-                    maybeShutdownListenersInternal();
-                }
-            });
-        }
     }
 
     /**