From 22ded807be8a81f09b618af4c79a9b2d8ee7496f Mon Sep 17 00:00:00 2001
From: Mark Latimer <mark.latimer@gmail.com>
Date: Sat, 2 May 2015 12:47:29 +0100
Subject: [PATCH] NIFI-573 fix NPE in nifi.sh and clean up open streams

Signed-off-by: Mark Payne <markap14@hotmail.com>
---
 .../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index d3796b5c9f..bb83e3d4b3 100644
--- a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -276,6 +276,8 @@ public class RunNiFi {
             final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             final String response = reader.readLine();
             logger.log(Level.FINE, "PING response: {0}", response);
+            out.close();
+            reader.close();
 
             return PING_CMD.equals(response);
         } catch (final IOException ioe) {
@@ -425,6 +427,7 @@ public class RunNiFi {
         final Integer port = getCurrentPort();
         if (port == null) {
             System.out.println("Apache NiFi is not currently running");
+            return;
         }
 
         final Properties nifiProps = loadProperties();
@@ -442,6 +445,7 @@ public class RunNiFi {
             final OutputStream out = socket.getOutputStream();
             out.write((DUMP_CMD + " " + secretKey + "\n").getBytes(StandardCharsets.UTF_8));
             out.flush();
+            out.close();
 
             final InputStream in = socket.getInputStream();
             final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
@@ -449,6 +453,7 @@ public class RunNiFi {
             while ((line = reader.readLine()) != null) {
                 sb.append(line).append("\n");
             }
+            reader.close();
         }
 
         final String dump = sb.toString();
@@ -483,10 +488,12 @@ public class RunNiFi {
             final OutputStream out = socket.getOutputStream();
             out.write((SHUTDOWN_CMD + " " + secretKey + "\n").getBytes(StandardCharsets.UTF_8));
             out.flush();
+            out.close();
 
             final InputStream in = socket.getInputStream();
             final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             final String response = reader.readLine();
+            reader.close();
 
             logger.log(Level.FINE, "Received response to SHUTDOWN command: {0}", response);