From 818af0c8d1a99b34e5bc3bb67ef6c86bbd9b113d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Kottmann?= <joern@apache.org>
Date: Thu, 12 Jan 2017 14:36:33 +0100
Subject: [PATCH] OPENNLP-935: Remove catch block to swallow IOException

---
 .../tools/ml/model/TwoPassDataIndexer.java    | 96 +++++++++----------
 1 file changed, 45 insertions(+), 51 deletions(-)

diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java
index 3755940b6..f2f6c3398 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java
@@ -80,35 +80,32 @@ public TwoPassDataIndexer(ObjectStream<Event> eventStream, int cutoff, boolean s
     System.out.println("Indexing events using cutoff of " + cutoff + "\n");
   
     System.out.print("\tComputing event counts...  ");
-    try {
-      File tmp = File.createTempFile("events", null);
-      tmp.deleteOnExit();
-      Writer osw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmp),"UTF8"));
-      int numEvents = computeEventCounts(eventStream, osw, predicateIndex, cutoff);
-      System.out.println("done. " + numEvents + " events");
-  
-      System.out.print("\tIndexing...  ");
-  
-      try (FileEventStream fes = new FileEventStream(tmp)) {
-        eventsToCompare = index(numEvents, fes, predicateIndex);
-      }
-      // done with predicates
-      predicateIndex = null;
-      tmp.delete();
-      System.out.println("done.");
-  
-      if (sort) {
-        System.out.print("Sorting and merging events... ");
-      }
-      else {
-        System.out.print("Collecting events... ");
-      }
-      sortAndMerge(eventsToCompare,sort);
-      System.out.println("Done indexing.");
+
+    File tmp = File.createTempFile("events", null);
+    tmp.deleteOnExit();
+    Writer osw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmp),"UTF8"));
+    int numEvents = computeEventCounts(eventStream, osw, predicateIndex, cutoff);
+    System.out.println("done. " + numEvents + " events");
+
+    System.out.print("\tIndexing...  ");
+
+    try (FileEventStream fes = new FileEventStream(tmp)) {
+      eventsToCompare = index(numEvents, fes, predicateIndex);
     }
-    catch (IOException e) {
-      System.err.println(e);
+    // done with predicates
+    predicateIndex = null;
+    tmp.delete();
+    System.out.println("done.");
+
+    if (sort) {
+      System.out.print("Sorting and merging events... ");
+    }
+    else {
+      System.out.print("Collecting events... ");
     }
+    sortAndMerge(eventsToCompare,sort);
+    System.out.println("Done indexing.");
+
   }
 
   public TwoPassDataIndexer() {}
@@ -124,35 +121,32 @@ public void index(ObjectStream<Event> eventStream) throws IOException {
     System.out.println("Indexing events using cutoff of " + cutoff + "\n");
 
     System.out.print("\tComputing event counts...  ");
-    try {
-      File tmp = File.createTempFile("events", null);
-      tmp.deleteOnExit();
-      Writer osw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmp),"UTF8"));
-      int numEvents = computeEventCounts(eventStream, osw, predicateIndex, cutoff);
-      System.out.println("done. " + numEvents + " events");
 
-      System.out.print("\tIndexing...  ");
+    File tmp = File.createTempFile("events", null);
+    tmp.deleteOnExit();
+    Writer osw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmp),"UTF8"));
+    int numEvents = computeEventCounts(eventStream, osw, predicateIndex, cutoff);
+    System.out.println("done. " + numEvents + " events");
 
-      try (FileEventStream fes = new FileEventStream(tmp)) {
-        eventsToCompare = index(numEvents, fes, predicateIndex);
-      }
-      // done with predicates
-      predicateIndex = null;
-      tmp.delete();
-      System.out.println("done.");
+    System.out.print("\tIndexing...  ");
 
-      if (sort) {
-        System.out.print("Sorting and merging events... ");
-      }
-      else {
-        System.out.print("Collecting events... ");
-      }
-      sortAndMerge(eventsToCompare,sort);
-      System.out.println("Done indexing.");
+    try (FileEventStream fes = new FileEventStream(tmp)) {
+      eventsToCompare = index(numEvents, fes, predicateIndex);
     }
-    catch (IOException e) {
-      System.err.println(e);
+    // done with predicates
+    predicateIndex = null;
+    tmp.delete();
+    System.out.println("done.");
+
+    if (sort) {
+      System.out.print("Sorting and merging events... ");
     }
+    else {
+      System.out.print("Collecting events... ");
+    }
+    sortAndMerge(eventsToCompare,sort);
+    System.out.println("Done indexing.");
+
   }
   /**
    * Reads events from <tt>eventStream</tt> into a linked list.  The