Add synchronization for trains window

JMRI · Oct 7, 2018 · 0a41b52 · 0a41b52
1 parent a9039f1
commit 0a41b52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/java/src/jmri/jmrit/operations/trains/TrainsTableModel.java b/java/src/jmri/jmrit/operations/trains/TrainsTableModel.java
@@ -88,17 +88,19 @@ private void updateList() {
         // first, remove listeners from the individual objects
         removePropertyChangeTrains();
 
-        if (_sort == SORTBYID) {
-            sysList = trainManager.getTrainsByIdList();
-        } else {
-            sysList = trainManager.getTrainsByTimeList();
-        }
+        synchronized (sysList) {
+            if (_sort == SORTBYID) {
+                sysList = trainManager.getTrainsByIdList();
+            } else {
+                sysList = trainManager.getTrainsByTimeList();
+            }
 
-        if (!isShowAll()) {
-            // filter out trains not checked
-            for (int i = sysList.size() - 1; i >= 0; i--) {
-                if (!sysList.get(i).isBuildEnabled()) {
-                    sysList.remove(i);
+            if (!isShowAll()) {
+                // filter out trains not checked
+                for (int i = sysList.size() - 1; i >= 0; i--) {
+                    if (!sysList.get(i).isBuildEnabled()) {
+                        sysList.remove(i);
+                    }
                 }
             }
         }
@@ -107,7 +109,7 @@ private void updateList() {
         addPropertyChangeTrains();
     }
 
-    List<Train> sysList = null;
+    List<Train> sysList = trainManager.getTrainsByTimeList();
     JTable _table = null;
     TrainsTableFrame _frame = null;
 

diff --git a/java/src/jmri/jmrit/operations/trains/excel/TrainCustomCommon.java b/java/src/jmri/jmrit/operations/trains/excel/TrainCustomCommon.java
@@ -198,7 +198,7 @@ public boolean waitForProcessToComplete() throws InterruptedException {
             log.debug("Waiting for Excel program to complete");
             status = process.waitFor(waitTimeSeconds, TimeUnit.SECONDS);
             if (file.exists()) {
-                log.error("Common file not deleted!");
+                log.error("Common file ({}) not deleted!", file.getPath());
                 return false;
             }
             log.debug("Excel program complete!");