svn commit: r818139 - in /activemq/branches/activemq-5.3: ./ activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java

[chirino]

Author: chirino
Date: Wed Sep 23 15:33:31 2009
New Revision: 818139

URL: http://svn.apache.org/viewvc?rev=818139&view=rev
Log:
Merging: http://svn.apache.org/viewvc?view=rev&revision=818138


Modified:
    activemq/branches/activemq-5.3/   (props changed)
    
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 23 15:33:31 2009
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298
+/activemq/trunk:816278-816279,816298,818138

Modified: 
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java?rev=818139&r1=818138&r2=818139&view=diff
==============================================================================
--- 
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
 (original)
+++ 
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
 Wed Sep 23 15:33:31 2009
@@ -93,7 +93,12 @@
      */
     public void onException(IOException e) {
         if (transportListener != null) {
-            transportListener.onException(e);
+            try {
+                transportListener.onException(e);
+            } catch (RuntimeException e2) {
+                // Handle any unexpected runtime exceptions by debug logging 
them.
+                LOG.debug("Unexpected runtime exception: "+e2, e2);
+            }
         }
     }