2 files changed, 8 insertions, 4 deletions

diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java
index c6131dd54d4..e160ab36b95 100644
--- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java
+++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java
@@ -17,7 +17,9 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+
 import javax.jms.JMSException;
+
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.messaging.ConnectionListener;
@@ -248,7 +250,7 @@ public class FailoverConnectionNode implements ConnectionNode, Runnable {
             if (connectionNode.isConnected()) {
                connected();
             }
-         } catch (OseeCoreException ex) {
+         }catch (OseeCoreException ex) {
             OseeLog.log(FailoverConnectionNode.class, Level.FINE, ex);
             notConnected();
          }
@@ -299,6 +301,5 @@ public class FailoverConnectionNode implements ConnectionNode, Runnable {
 
    public void onException(JMSException ex) {
       connectionNode.stop();
-      run();
    }
 }
diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
index 46479d810b8..768603d26cc 100644
--- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
+++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
@@ -19,6 +19,7 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
+
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
 import javax.jms.ExceptionListener;
@@ -30,6 +31,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TemporaryTopic;
 import javax.jms.Topic;
+
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeWrappedException;
@@ -323,15 +325,16 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi
             session = null;
          }
       } catch (JMSException ex) {
-         OseeLog.log(ConnectionNodeActiveMq.class, Level.SEVERE, ex);
+         OseeLog.log(ConnectionNodeActiveMq.class, Level.FINEST, ex);
       }
       try {
          if (connection != null) {
+        	connection.setExceptionListener(null);
             connection.close();
             connection = null;
          }
       } catch (JMSException ex) {
-         OseeLog.log(ConnectionNodeActiveMq.class, Level.SEVERE, ex);
+         OseeLog.log(ConnectionNodeActiveMq.class, Level.FINEST, ex);
       }
    }