Repository: incubator-blur Updated Branches: refs/heads/apache-blur-0.2 ce74aa204 -> b44ebeb46
Fixed a NPE on server startup Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/b44ebeb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b44ebeb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b44ebeb4 Branch: refs/heads/apache-blur-0.2 Commit: b44ebeb46b88f136321176e287aaaaf40164d247 Parents: ce74aa2 Author: chrisrohr <[email protected]> Authored: Mon Jun 23 20:34:10 2014 +0000 Committer: chrisrohr <[email protected]> Committed: Mon Jun 23 20:34:10 2014 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/blur/console/JettyServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b44ebeb4/blur-console/src/main/java/org/apache/blur/console/JettyServer.java ---------------------------------------------------------------------- diff --git a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java index 2bcb190..8b693cb 100644 --- a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java +++ b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java @@ -65,9 +65,9 @@ public class JettyServer { // for localhost:port/console/index.html and whatever else is in the webapp directory URL warUrl = null; if (devMode) { - this.getClass().getClassLoader().getResource(DEV_WEBAPPDIR); + warUrl = this.getClass().getClassLoader().getResource(DEV_WEBAPPDIR); } else { - this.getClass().getClassLoader().getResource(PROD_WEBAPPDIR); + warUrl = this.getClass().getClassLoader().getResource(PROD_WEBAPPDIR); } String warUrlString = warUrl.toExternalForm(); server.setHandler(new WebAppContext(warUrlString, CONTEXTPATH));
