406618 Jetty startup in OSGi Equinox fails when using option jetty.home.bundle=org.eclipse.jetty.osgi.boot
This commit is contained in:
parent
5306c540bf
commit
0f2173dcc3
|
@ -232,7 +232,7 @@ public class DefaultJettyAtJettyHomeHelper
|
||||||
// can define their own configuration.
|
// can define their own configuration.
|
||||||
if ((enUrls == null || !enUrls.hasMoreElements()))
|
if ((enUrls == null || !enUrls.hasMoreElements()))
|
||||||
{
|
{
|
||||||
String tmp = DEFAULT_JETTYHOME+etcFile;
|
String tmp = DEFAULT_JETTYHOME+(DEFAULT_JETTYHOME.endsWith("/")?"":"/")+etcFile;
|
||||||
enUrls = BundleFileLocatorHelperFactory.getFactory().getHelper().findEntries(configurationBundle, tmp);
|
enUrls = BundleFileLocatorHelperFactory.getFactory().getHelper().findEntries(configurationBundle, tmp);
|
||||||
LOG.info("Configuring jetty from bundle: "
|
LOG.info("Configuring jetty from bundle: "
|
||||||
+ configurationBundle.getSymbolicName()
|
+ configurationBundle.getSymbolicName()
|
||||||
|
|
Loading…
Reference in New Issue