You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/07 02:51:26 UTC

svn commit: r419752 - /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

Author: chirino
Date: Thu Jul  6 17:51:25 2006
New Revision: 419752

URL: http://svn.apache.org/viewvc?rev=419752&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQ-799

Modified:
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=419752&r1=419751&r2=419752&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Thu Jul  6 17:51:25 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.BrokerId;
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionError;
 import org.apache.activemq.command.ConnectionId;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.ConsumerId;
@@ -317,7 +318,7 @@
         }
     }
 
-    protected void serviceRemoteException(Exception error) {
+    protected void serviceRemoteException(Throwable error) {
         log.info("Network connection between "+localBroker+" and "+remoteBroker+" shutdown: "+error.getMessage(),error);
         ServiceSupport.dispose(this);
     }
@@ -336,6 +337,9 @@
                     }
                 }else if(command.isBrokerInfo()){
                     serviceRemoteBrokerInfo(command);
+                }else if(command.getClass() == ConnectionError.class ) {
+                	ConnectionError ce = (ConnectionError) command;
+                	serviceRemoteException(ce.getException());
                 }else{
                     switch(command.getDataStructureType()){
                     case KeepAliveInfo.DATA_STRUCTURE_TYPE:
@@ -520,7 +524,9 @@
                         shutDown = true;
                         doStop();
                     }
-                    
+                }else if(command.getClass() == ConnectionError.class ) {
+                	ConnectionError ce = (ConnectionError) command;
+                	serviceLocalException(ce.getException());                    
                 }else{
                     switch(command.getDataStructureType()){
                     case WireFormatInfo.DATA_STRUCTURE_TYPE: