Fixed java csv writer. Removed deprecated java flag

ZeroCM · May 29, 2019 · 853b6bd · 853b6bd
1 parent e66a387
commit 853b6bd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/tools/java/zcm-csv-reader.in b/tools/java/zcm-csv-reader.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 prefix=@prefix@
 jars=$prefix/share/java/zcm.jar:$prefix/share/java/zcm-tools.jar
-exec java -server -Xincgc -Xmx64m -Xms32m -ea -cp $jars zcm.logging.CsvReader $*
+exec java -server -Xmx64m -Xms32m -ea -cp $jars zcm.logging.CsvReader $*
diff --git a/tools/java/zcm-csv-writer.in b/tools/java/zcm-csv-writer.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 prefix=@prefix@
 jars=$prefix/share/java/zcm.jar:$prefix/share/java/zcm-tools.jar
-exec java -server -Xincgc -Xmx64m -Xms32m -ea -cp $jars zcm.logging.CsvWriter $*
+exec java -server -Xmx64m -Xms32m -ea -cp $jars zcm.logging.CsvWriter $*
diff --git a/tools/java/zcm-log-transcoder-java.in b/tools/java/zcm-log-transcoder-java.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 prefix=@prefix@
 jars=$prefix/share/java/zcm.jar:$prefix/share/java/zcm-tools.jar
-exec java -server -Xincgc -Xmx64m -Xms32m -ea -cp $jars zcm.logging.Transcoder $*
+exec java -server -Xmx64m -Xms32m -ea -cp $jars zcm.logging.Transcoder $*
diff --git a/tools/java/zcm-logplayer-gui.in b/tools/java/zcm-logplayer-gui.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 prefix=@prefix@
 jars=$prefix/share/java/zcm.jar:$prefix/share/java/zcm-tools.jar
-exec java -server -Xincgc -Xmx64m -Xms32m -ea -cp $jars zcm.logging.LogPlayer $*
+exec java -server -Xmx64m -Xms32m -ea -cp $jars zcm.logging.LogPlayer $*
diff --git a/tools/java/zcm-spy.in b/tools/java/zcm-spy.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 prefix=@prefix@
 jars=$prefix/share/java/zcm.jar:$prefix/share/java/zcm-tools.jar
-exec java -server -Xincgc -Xmx128m -Xms64m -ea -cp $jars zcm.spy.Spy $*
+exec java -server -Xmx128m -Xms64m -ea -cp $jars zcm.spy.Spy $*
diff --git a/tools/java/zcm/logging/CsvWriter.java b/tools/java/zcm/logging/CsvWriter.java
@@ -17,7 +17,7 @@
 
 public class CsvWriter implements ZCMSubscriber
 {
-    private ZCM zcm;
+    private ZCM zcm = null;
     private ZCM.Subscription subs;
 
     private ZCMTypeDatabase handlers;
@@ -70,12 +70,12 @@ public CsvWriter(PrintWriter output, Log log, String zcm_url,
 
     private void verbosePrintln(String str)
     {
-        if(verbose) System.out.println(str);
+        if (verbose) System.out.println(str);
     }
 
     private void verbosePrint(String str)
     {
-        if(verbose) System.out.print(str);
+        if (verbose) System.out.print(str);
     }
 
     public void messageReceived(ZCM zcm, String channel, ZCMDataInputStream dins)
@@ -120,19 +120,27 @@ public void run()
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
                 done = true;
-                zcm.stop();
-                zcm.unsubscribe(subs);
-                zcm.close();
+                if (zcm != null) {
+                    zcm.stop();
+                    zcm.unsubscribe(subs);
+                    zcm.close();
+                }
+                if (log != null) {
+                    try {
+                        log.close();
+                    } catch (IOException e) {
+                        System.err.println("Error closing input log");
+                    }
+                }
                 output.close();
                 System.out.print("\b\b  ");
                 System.out.println("Wrote " + numLinesWritten + " events");
                 System.out.println("Cleaning up and quitting");
             }
         });
 
-        zcm.start();
-
         if (log == null) {
+            zcm.start();
             while (true) try { Thread.sleep(1000); } catch(Exception e) {}
         } else {
             long lastPrintTime = 0;