ok really stopping the gui this time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/23e362bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/23e362bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/23e362bb Branch: refs/heads/master Commit: 23e362bbd72d9048a5cae7c3fb1b1131e14c1266 Parents: 5ae2318 Author: gbarton <[email protected]> Authored: Mon Jul 30 16:49:54 2012 -0400 Committer: gbarton <[email protected]> Committed: Mon Jul 30 16:49:54 2012 -0400 ---------------------------------------------------------------------- .../blur/thrift/ThriftBlurControllerServer.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/23e362bb/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurControllerServer.java b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurControllerServer.java index 782204c..403f31f 100644 --- a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurControllerServer.java +++ b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurControllerServer.java @@ -130,14 +130,14 @@ public class ThriftBlurControllerServer extends ThriftServer { server.setThreadCount(threadCount); server.setIface(iface); - HttpJettyServer httpServer = new HttpJettyServer(configuration.get(BLUR_GUI_CONTROLLER_PORT), "controller"); + final HttpJettyServer httpServer = new HttpJettyServer(configuration.get(BLUR_GUI_CONTROLLER_PORT), "controller"); // This will shutdown the server when the correct path is set in zk new BlurServerShutDown().register(new BlurShutdown() { @Override public void shutdown() { ThreadWatcher threadWatcher = ThreadWatcher.instance(); - quietClose(server, controllerServer, clusterStatus, zooKeeper, threadWatcher); + quietClose(server, controllerServer, clusterStatus, zooKeeper, threadWatcher, httpServer); System.exit(0); } }, zooKeeper);
