diff -u -r1.3 -r1.4
--- DefaultEtEventProcessor.java	30 Apr 2012 04:17:58 -0000	1.3
+++ DefaultEtEventProcessor.java	30 Apr 2012 13:36:56 -0000	1.4
@@ -22,7 +22,7 @@

  * This class executes the default event processing chain for HPS Test Run monitoring: ET -> EVIO -> LCIO.
  * Its method {@link #process()} should be executed on a separate thread which can be joined until it dies.
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: DefaultEtEventProcessor.java,v 1.3 2012/04/30 04:17:58 jeremy Exp $

+ * @version $Id: DefaultEtEventProcessor.java,v 1.4 2012/04/30 13:36:56 jeremy Exp $

  */
 public class DefaultEtEventProcessor implements EtEventProcessor
 {

@@ -265,6 +265,7 @@

             // There was some error processing the EtEvent.
             catch (Exception e) {
                 e.printStackTrace(); // This should show up in detailed job log in terminal or output file.

+                // FIXME: This message seems to show up multiple times in the log table.

                 logger.log(Level.WARNING, "Error processing event <" + this.eventsProcessed + ">.");
                 if (stopOnError) {
                     this.status = ConnectionStatus.ERROR;

diff -u -r1.31 -r1.32
--- MonitoringApplication.java	30 Apr 2012 04:17:58 -0000	1.31
+++ MonitoringApplication.java	30 Apr 2012 13:36:56 -0000	1.32
@@ -73,7 +73,7 @@

  * calling its main() method.
  * 
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: MonitoringApplication.java,v 1.31 2012/04/30 04:17:58 jeremy Exp $

+ * @version $Id: MonitoringApplication.java,v 1.32 2012/04/30 13:36:56 jeremy Exp $

  */
 public class MonitoringApplication {
 

@@ -1028,6 +1028,7 @@

             t.join();
         }
         catch (InterruptedException e) {}

+        t = null;

         logger.log(Level.FINE, "Event processor exited with status <" + ConnectionStatus.toString(eventProcessor.getStatus()) + ">.");
 
         // Disconnect with the status which was set by the event processor, if not disconnected already.

@@ -1131,9 +1132,14 @@

 
         logger.log(Level.FINER, "Disconnecting from ET system.");
         

+        if (getConnectionStatus() == ConnectionStatus.DISCONNECTED) {
+            logger.log(Level.WARNING, "Disconnect was called but already disconnected.");
+            return;
+        }
+        

         // Show a warning dialog box before disconnecting, if this option is selected.
         if (warnOnDisconnect()) {

-            logger.log(Level.FINER, "Waiting for user to verify disconnect.");

+            logger.log(Level.FINER, "Waiting for user to verify disconnect request.");

             showDialog("You are about to be disconnected.");
         }
 

@@ -1144,10 +1150,11 @@

         if (connection != null) {
 
             // Disconnect from the ET system.

-            // FIXME: This can block forever!

+            // FIXME: This can block forever!  
+            // Should probably put on separate thread and wait for 10 seconds or so.

             connection.cleanup(); 
 

-            // The connection is now unusable.

+            // The connection is now unusable so set it to null.

             connection = null;
         }