From 2708079f82f8a9f780518be681ccd4944182251d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 8 May 2014 11:24:26 -0400
Subject: [PATCH] Convert string buffer from instance to locla variable in
 AbstractFileStringExtract

---
 .../keywordsearch/AbstractFileStringExtract.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 65ef4c31a1..1f6614ba28 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -44,12 +44,11 @@ class AbstractFileStringExtract implements AbstractFileExtract {
     private static final int BOM_LEN = 0;  //disabled prepending of BOM
     private static final Charset INDEX_CHARSET = Server.DEFAULT_INDEXED_TEXT_CHARSET;
     private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2;
-    private final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
     private KeywordSearchIngestModule module;
     private AbstractFile sourceFile;
     private int numChunks = 0;
-    private final List<SCRIPT> extractScripts = new ArrayList<SCRIPT>();
-    private Map<String, String> extractOptions = new HashMap<String, String>();   
+    private final List<SCRIPT> extractScripts = new ArrayList<>();
+    private Map<String, String> extractOptions = new HashMap<>();   
 
     //disabled prepending of BOM
     //static {
@@ -73,7 +72,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
 
     @Override
     public List<SCRIPT> getScripts() {
-        return new ArrayList<SCRIPT>(extractScripts);
+        return new ArrayList<>(extractScripts);
     }
 
     @Override
@@ -114,7 +113,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
             return true;
         }
 
-        InputStream stringStream = null;
+        InputStream stringStream;
         //check which extract stream to use
         if (extractScripts.size() == 1 && extractScripts.get(0).equals(SCRIPT.LATIN_1)) {
             //optimal for english, english only
@@ -129,7 +128,8 @@ class AbstractFileStringExtract implements AbstractFileExtract {
             success = true;
             //break input stream into chunks 
 
-            long readSize = 0;
+            final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
+            long readSize;
             while ((readSize = stringStream.read(stringChunkBuf, BOM_LEN, (int) MAX_STRING_CHUNK_SIZE - BOM_LEN)) != -1) {
                 //FileOutputStream debug = new FileOutputStream("c:\\temp\\" + sourceFile.getName() + Integer.toString(this.numChunks+1));
                 //debug.write(stringChunkBuf, 0, (int)readSize);