| commit | 5aa5a4e525374ce9b73e224497b8fb77020c7c98 | [log] [tgz] |
|---|---|---|
| author | Greg Wilkins <gregw@webtide.com> | Thu Jul 30 18:50:04 2015 +1000 |
| committer | Greg Wilkins <gregw@webtide.com> | Thu Jul 30 18:50:04 2015 +1000 |
| tree | 7511c652a1b64c8a43ad56418e1a1f52977eb03a | |
| parent | a568ee6f171089c2e76cf0b44f484a2df19c0675 [diff] |
fixed accidental NPE on Context logger
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 12244d4..ef4ec31 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -707,7 +707,7 @@ if (_contextPath == null) throw new IllegalStateException("Null contextPath"); - if (_logger!=null) + if (_logger==null) _logger = Log.getLogger(getDisplayName() == null?getContextPath():getDisplayName()); ClassLoader old_classloader = null; Thread current_thread = null;