Finally fix grepper never finishing...

Author: CoreyD97

src/main/java/com/nccgroup/loggerplusplus/grepper/GrepperController.java

@@ -121,27 +121,30 @@ private void processMatches(GrepResults grepResults, Pattern pattern, byte[] con
     private Runnable createProcessThread(final LogEntry logEntry, final Pattern pattern,
                                          final boolean inScopeOnly, final boolean searchRequests, final boolean searchResponses) {
         return () -> {
-            if (Thread.currentThread().isInterrupted()) return;
-            GrepResults grepResults = null;
-            if (!inScopeOnly || LoggerPlusPlus.isUrlInScope(logEntry.getUrlString())) {
-                grepResults = processEntry(logEntry, pattern, searchRequests, searchResponses);
-            }
-            for (GrepperListener listener : this.listeners) {
-                try {
-                    listener.onEntryProcessed(grepResults);
-                } catch (Exception e) {
-                    e.printStackTrace();
+            try {
+                if (Thread.currentThread().isInterrupted()) return;
+                GrepResults grepResults = null;
+                if (!inScopeOnly || LoggerPlusPlus.isUrlInScope(logEntry.getUrlString())) {
+                    grepResults = processEntry(logEntry, pattern, searchRequests, searchResponses);
                 }
-            }
-            int remaining = remainingEntries.decrementAndGet();
-            if(remaining == 0){
-                for (GrepperListener listener : listeners) {
+                for (GrepperListener listener : this.listeners) {
                     try {
-                        listener.onSearchComplete();
-                    }catch (Exception e){
+                        listener.onEntryProcessed(grepResults);
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
+            }finally {
+                int remaining = remainingEntries.decrementAndGet();
+                if (remaining == 0) {
+                    for (GrepperListener listener : listeners) {
+                        try {
+                            listener.onSearchComplete();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
             }
         };
     }