Updated Branches: refs/heads/master 80b4b0760 -> 742b1625f
ACCUMULO-1709 applied steve loughran's patch to fix process exit code Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/789c9204 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/789c9204 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/789c9204 Branch: refs/heads/master Commit: 789c920404561521948f38642c142ec99065f50e Parents: 0895046 Author: Billie Rinaldi <[email protected]> Authored: Wed Sep 11 13:35:46 2013 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Wed Sep 11 13:35:46 2013 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/master/Master.java | 1 + .../org/apache/accumulo/server/tabletserver/TabletServer.java | 1 + start/src/main/java/org/apache/accumulo/start/Main.java | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/789c9204/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 64e2930..779673a 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -2240,6 +2240,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt master.run(); } catch (Exception ex) { log.error("Unexpected exception, exiting", ex); + System.exit(1); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/789c9204/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index 3c936f9..b670f13 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -3236,6 +3236,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu server.run(); } catch (Exception ex) { log.error("Uncaught exception in TabletServer.main, exiting", ex); + System.exit(1); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/789c9204/start/src/main/java/org/apache/accumulo/start/Main.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java index a92ba44..a93a9d8 100644 --- a/start/src/main/java/org/apache/accumulo/start/Main.java +++ b/start/src/main/java/org/apache/accumulo/start/Main.java @@ -100,7 +100,7 @@ public class Main { try { finalMain.invoke(null, thisIsJustOneArgument); } catch (Exception e) { - System.err.println("Thread \"" + Thread.currentThread().getName() + "\" died " + e.getMessage()); + System.err.println("Thread \"" + Thread.currentThread().getName() + "\" died " + e); e.printStackTrace(System.err); System.exit(1); } @@ -111,8 +111,9 @@ public class Main { t.setContextClassLoader(cl); t.start(); } catch (Throwable t) { - System.err.println("Uncaught exception: " + t.getMessage()); + System.err.println("Uncaught exception: " + t); t.printStackTrace(System.err); + System.exit(1); } }
