Changeset 660 in tmcsimulator for trunk/src/tmcsim/cadsimulator

Timestamp:

09/12/2022 04:20:14 PM (4 years ago)

Author:

jdalbey

Message:

!CADClientConnector.java Catch socketexception to drop clients that have disconnected. Hope this fixes #160.

Location:

trunk/src/tmcsim/cadsimulator

Files:

• CADClientConnector.java (modified) (2 diffs)
• Coordinator.java (modified) (6 diffs)

trunk/src/tmcsim/cadsimulator/CADClientConnector.java

@@ -5 +5 @@
 import java.io.ObjectOutputStream;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.Observable;
 import java.util.Observer;
@@ -106 +107 @@
         catch (ClassNotFoundException cnfe) {
             cnfe.printStackTrace();
+        }
+        catch (SocketException except)
+        {
+            if (except.getMessage().endsWith("reset"))
+            {
+                cadLogger.logp(Level.INFO, "CADClientConnector", "run", "Connection reset, removing client.\n");
+                disconnectClient();
+            }
         }
         catch (IOException ioe) {                   

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -12 +12 @@
 import java.rmi.server.UnicastRemoteObject;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -34 +33 @@
 import tmcsim.cadmodels.IncidentInquiryUnitsAssigned;
 import tmcsim.cadmodels.IncidentSummaryModel_obj;
-import static tmcsim.cadsimulator.CADServer.theATMSMgr;
 import tmcsim.cadsimulator.db.CMSDiversionDB;
 import tmcsim.cadsimulator.managers.ATMSManager;
@@ -41 +39 @@
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
 import tmcsim.cadsimulator.managers.SimulationClockManager;
-import tmcsim.cadsimulator.managers.TrafficModelManager;
-import static tmcsim.cadsimulator.managers.TrafficModelManager.loadProperties;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.client.cadclientgui.CardfileReader;
@@ -79 +75 @@
 import tmcsim.common.SimulationException;
 import tmcsim.common.XMLIncident;
-import tmcsim.common.TimeUtils;
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.CoordinatorInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import tmcsim.simulationmanager.SimulationManagerView;
-import tmcsim.simulationmanager.actions.LoadScriptAction;
-import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -117 +109 @@
     /**
      * Filename where copy of incident script is written to be used by
-     * EI notebook.  The same path as kSimClockFilename is used.
+     * EI notebook.  The same path as kSimClockFilename is used (passed parameter).
      */
     private final static String kIncidentScriptFilename = "incident_script.xml";
@@ -167 +159 @@
         try
         {
-            CardfileReader cfr = new CardfileReader(SCENARIOS_DIR+"/Cardfile.xml", cardfileData);
+            CardfileReader cfr = new CardfileReader("Scenarios/Cardfile.xml", cardfileData);
         } catch (Exception e)
         {
-            System.out.println("Could not load cardfile script");
+            System.out.println("Coordinator constructor could not load cardfile xml file.");
+            System.out.println(e.getMessage());
         }