Changeset 30702

Timestamp:

2016-08-12T19:52:01+12:00 (7 years ago)

Author:

ak19

Message:

Minor general improvements that I didn't want to commit with the previous, major commit (which was to do with the new ConfigFileEditor).

File:

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

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -93 +93 @@
         System.err.println("*** Exception occurred: " + e.getMessage());
     } finally {
-        try {
-        if(fin != null) {
-            fin.close();
-            fin = null;
-        }
-        } catch(IOException ioe) {
-        fin = null;
-        
-        }
+        closeResource(fin);     
     }
 
@@ -583 +575 @@
         System.err.println("Exception occurred: " + e.getMessage());
     } finally {
-        try {
-        if(fin != null) {
-            fin.close();
-            fin = null;
-        }
-        if(fout != null) {
-            fout.close();
-            fout = null;
-        }
-        } catch(IOException ioe) {
-        fin = null;
-        fout = null;
-        }
+        closeResource(fin);
+        closeResource(fout);        
         
     }
-        return oldValue;
+    return oldValue;
     }
 
@@ -614 +595 @@
         System.err.println("Exception closing resource: " + e.getMessage());
         e.printStackTrace();
+        resourceHandle = null;
     }
     }