activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1143535 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
Date Wed, 06 Jul 2011 19:12:26 GMT
Author: tabish
Date: Wed Jul  6 19:12:26 2011
New Revision: 1143535

URL: http://svn.apache.org/viewvc?rev=1143535&view=rev
Log:
apply patch for https://issues.apache.org/jira/browse/AMQ-3074

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1143535&r1=1143534&r2=1143535&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
Wed Jul  6 19:12:26 2011
@@ -201,7 +201,7 @@ public class TransportConnection impleme
 
     /**
      * Returns the number of messages to be dispatched to this connection
-     * 
+     *
      * @return size of dispatch queue
      */
     public int getDispatchQueueSize() {
@@ -249,7 +249,7 @@ public class TransportConnection impleme
      * Calls the serviceException method in an async thread. Since handling a
      * service exception closes a socket, we should not tie up broker threads
      * since client sockets may hang or cause deadlocks.
-     * 
+     *
      * @param e
      */
     public void serviceExceptionAsync(final IOException e) {
@@ -700,7 +700,7 @@ public class TransportConnection impleme
         if (info.getClientIp() == null) {
             info.setClientIp(getRemoteAddress());
         }
-       
+
         try {
             broker.addConnection(context, info);
         } catch (Exception e) {
@@ -912,7 +912,7 @@ public class TransportConnection impleme
                     info.setPeerBrokerInfos(null);
                 }
                 dispatchAsync(info);
-                
+
                 connector.onStarted(this);
             }
         } catch (Exception e) {
@@ -1160,7 +1160,7 @@ public class TransportConnection impleme
     public synchronized boolean isNetworkConnection() {
         return networkConnection;
     }
-    
+
     public boolean isFaultTolerantConnection() {
        return this.faultTolerantConnection;
     }
@@ -1187,7 +1187,7 @@ public class TransportConnection impleme
             // passive ?
             boolean passive = bService.isPassiveSlave() || info.isPassiveSlave();
             if (passive == false) {
-                
+
                 // stream messages from this broker (the master) to
                 // the slave
                 MutableBrokerFilter parent = (MutableBrokerFilter) broker.getAdaptor(MutableBrokerFilter.class);
@@ -1212,7 +1212,7 @@ public class TransportConnection impleme
                 // It's possible in case of brief network fault to have this transport connector
side of the connection always active
                 // and the duplex network connector side wanting to open a new one
                 // In this case, the old connection must be broken
-                String duplexNetworkConnectorId = config.getName() + "@" + info.getBrokerId();

+                String duplexNetworkConnectorId = config.getName() + "@" + info.getBrokerId();
                 CopyOnWriteArrayList<TransportConnection> connections = this.connector.getConnections();
                 synchronized (connections) {
                     for (Iterator<TransportConnection> iter = connections.iterator();
iter.hasNext();) {
@@ -1296,7 +1296,7 @@ public class TransportConnection impleme
         }
         return null;
     }
-        
+
     public void updateClient(ConnectionControl control) {
         if (isActive() && isBlocked() == false && isFaultTolerantConnection()
&& this.wireFormatInfo != null
                 && this.wireFormatInfo.getVersion() >= 6) {
@@ -1309,7 +1309,7 @@ public class TransportConnection impleme
         if (result == null) {
             synchronized (producerExchanges) {
                 result = new ProducerBrokerExchange();
-                TransportConnectionState state = lookupConnectionState(id);             

+                TransportConnectionState state = lookupConnectionState(id);
                 context = state.getContext();
                 if (context.isReconnect()) {
                     result.setLastStoredSequenceId(broker.getBrokerService().getPersistenceAdapter().getLastProducerSequenceId(id));
@@ -1451,7 +1451,11 @@ public class TransportConnection impleme
     protected synchronized String getDuplexNetworkConnectorId() {
         return this.duplexNetworkConnectorId;
     }
-    
+
+    public boolean isStopping() {
+        return stopping.get();
+    }
+
     protected CountDownLatch getStopped() {
         return stopped;
     }



Mime
View raw message