diff options
author | Jan Bartel | 2012-05-17 14:41:01 +0000 |
---|---|---|
committer | Jan Bartel | 2012-05-17 14:41:01 +0000 |
commit | 050db55f1bb86e3071ce50dbd69b2023efaaa44c (patch) | |
tree | 9bd352c4ab79a1505c549ab933e1f52df105ddbb | |
parent | d70f8b2012d2cd06977429abb9567143131daf69 (diff) | |
download | org.eclipse.jetty.project-050db55f1bb86e3071ce50dbd69b2023efaaa44c.tar.gz org.eclipse.jetty.project-050db55f1bb86e3071ce50dbd69b2023efaaa44c.tar.xz org.eclipse.jetty.project-050db55f1bb86e3071ce50dbd69b2023efaaa44c.zip |
NullPointer fix
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java index 586513776f..fa8c045b6f 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java @@ -128,7 +128,7 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen } //Set the base resource of the ContextHandler, if not already set, can also be overridden by the context xml file - if (_contextHandler.getBaseResource() == null) + if (_contextHandler != null && _contextHandler.getBaseResource() == null) { _contextHandler.setBaseResource(rootResource); } |