From ce7a271f7da2ffe4b5a24221e4a960bea15d004d Mon Sep 17 00:00:00 2001 From: Hugues Malphettes Date: Fri, 18 Jun 2010 20:54:40 +0000 Subject: [PATCH] bug 317231 ability to define the jety configuration in a fragment that contains an etc/jetty.xml file git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2026 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../osgi/boot/internal/webapp/WebappRegistrationHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java index 32507b490b6..b3b04f7a17f 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java @@ -201,7 +201,7 @@ public class WebappRegistrationHelper public void setup(BundleContext context, Map configProperties) throws Exception { Enumeration enUrls = context.getBundle().findEntries("/etc", "jetty.xml", false);System.err.println(); - if (enUrls.hasMoreElements()) + if (enUrls != null && enUrls.hasMoreElements()) { URL url = (URL) enUrls.nextElement(); if (url != null)