Changeset 34294 for main/trunk

Timestamp:

2020-07-27T15:42:51+12:00 (4 years ago)

Author:

ak19

Message:

Kathy noticed that the try-with-resources does not work with the JDK 6 on the 64 bit VM, so the nightlies failed to go through. Going back to the old way of writing try statements that work with closeable resources. There may be more errors on the nightly remaining, but this was the first.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataToCSV.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataToCSV.java

@@ -344 +344 @@
         .withQuoteMode(QuoteMode.MINIMAL)
         .withTrim();
-    
-    try (CSVPrinter printer = new CSVPrinter(new FileWriter(csvFile, appendSetting), customCSVFormat)) {
+
+    // try-with-resources breaks on 64 bit Linux nightly binary VM as that uses JDK 6.
+    //try (CSVPrinter printer = new CSVPrinter(new FileWriter(csvFile, appendSetting), customCSVFormat)) {
+
+    CSVPrinter printer = null;
+    try {
+        printer = new CSVPrinter(new FileWriter(csvFile, appendSetting), customCSVFormat);
+        
         printer.printRecord(columnHeadings);
         // https://javadoc.io/doc/org.apache.commons/commons-csv/latest/index.html
@@ -380 +386 @@
         printer.println(); // done writing a record
         }
+
+        printer.close(true); // flush and close
+        
     } catch (IOException ex) {
         success = false;
@@ -385 +394 @@
         System.err.println("Caught exception when writing meta to CSVFile " + csvFile.getAbsolutePath());
         System.err.println("\t" + ex.getMessage());
+
+        SafeProcess.closeResource(printer);
     }