You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/10 19:00:56 UTC
[12/28] incubator-nifi git commit: NIFI-145: Fixed stack trace that
occassionally occurs on shutdown
NIFI-145: Fixed stack trace that occassionally occurs on shutdown
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f63cd9a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f63cd9a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f63cd9a1
Branch: refs/heads/nifi-27
Commit: f63cd9a15ee42715ff0b70873f30f3954242a957
Parents: 97f8ab0
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 10 12:17:32 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 10 12:17:32 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f63cd9a1/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index af783a1..1b82a3c 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -397,7 +397,11 @@ public class RunNiFi {
} catch (final InterruptedException ie) {
}
} else {
- runtime.removeShutdownHook(shutdownHook);
+ try {
+ runtime.removeShutdownHook(shutdownHook);
+ } catch (final IllegalStateException ise) {
+ // happens when already shutting down
+ }
if (autoRestartNiFi) {
System.out.println("Apache NiFi appears to have died. Restarting...");