diff options
| author | Jan Bartel | 2013-05-01 23:07:24 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-05-01 23:07:24 +0000 |
| commit | e7ecfd2b2b462fa1d90fbfdaad3e05469dabfdfd (patch) | |
| tree | 7319eff2695d1c1fb98ac0275ab4b406d6920572 /jetty-osgi | |
| parent | 2360f5dcd598490e8400a6e51c7783a748fd7d04 (diff) | |
| parent | 7ddd2c6cfd0a02ad2d3475d48f60cd7cf57354bd (diff) | |
| download | org.eclipse.jetty.project-e7ecfd2b2b462fa1d90fbfdaad3e05469dabfdfd.tar.gz org.eclipse.jetty.project-e7ecfd2b2b462fa1d90fbfdaad3e05469dabfdfd.tar.xz org.eclipse.jetty.project-e7ecfd2b2b462fa1d90fbfdaad3e05469dabfdfd.zip | |
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
Diffstat (limited to 'jetty-osgi')
| -rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.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/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java index a89ff5b730..f20838b762 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java @@ -236,7 +236,7 @@ public class DefaultJettyAtJettyHomeHelper // can define their own configuration. 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); LOG.info("Configuring jetty from bundle: " + configurationBundle.getSymbolicName() |