Close stream. Buffer directly from File. Fix arg.

"Fix arg" has no true effect since it is later
ignored anyway by the FileHistoryCache method,
but it was counterintuitive without the fix.

Author: idodeclare

src/org/opensolaris/opengrok/history/FileHistoryCache.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
  */
 
 package org.opensolaris.opengrok.history;
@@ -223,13 +224,10 @@ private static File getCachedFile(File file) throws HistoryException,
      * Read history from a file.
      */
     private static History readCache(File file) throws IOException {
-        try {
-            FileInputStream in = new FileInputStream(file);
-            XMLDecoder d = new XMLDecoder(
-                new BufferedInputStream(new GZIPInputStream(in)));
+        try (FileInputStream in = new FileInputStream(file);
+            XMLDecoder d = new XMLDecoder(new GZIPInputStream(
+                new BufferedInputStream(in)))) {
             return (History) d.readObject();
-        } catch (IOException e) {
-            throw e;
         }
     }
 
@@ -253,9 +251,8 @@ private void writeHistoryToFile(File dir, History history, File cacheFile) throw
         try {
             output = File.createTempFile("oghist", null, dir);
             try (FileOutputStream out = new FileOutputStream(output);
-                    XMLEncoder e = new XMLEncoder(
-                            new BufferedOutputStream(
-                                    new GZIPOutputStream(out)))) {
+                XMLEncoder e = new XMLEncoder(new GZIPOutputStream(
+                    new BufferedOutputStream(out)))) {
                 e.setPersistenceDelegate(File.class,
                         new FilePersistenceDelegate());
                 e.writeObject(history);

src/org/opensolaris/opengrok/history/HistoryGuru.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -215,7 +215,7 @@ public History getHistory(File file) throws HistoryException {
     }
 
     public History getHistory(File file, boolean withFiles) throws HistoryException {
-        return getHistory(file, true, false);
+        return getHistory(file, withFiles, false);
     }
 
     /**