Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-12-17 06:22:34 -0500
committerJan Bartel2014-12-17 06:22:34 -0500
commit89a9aa2472a71b1a19659f0bae2e55ca76717491 (patch)
treefa329ef15ea9aba49d7032dbd7f947c6f82ef832 /jetty-osgi/jetty-osgi-boot/src
parent40ae4767d10d28ddb81af026315754e866a8434f (diff)
downloadorg.eclipse.jetty.project-89a9aa2472a71b1a19659f0bae2e55ca76717491.tar.gz
org.eclipse.jetty.project-89a9aa2472a71b1a19659f0bae2e55ca76717491.tar.xz
org.eclipse.jetty.project-89a9aa2472a71b1a19659f0bae2e55ca76717491.zip
455330 Multiple Jetty-ContextFilePath entries separated by commas doesn't work
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java4
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
index 28f72c814f..030ac00588 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
@@ -403,7 +403,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
throw new IllegalStateException("Unable to get PackageAdmin reference to locate required Tld bundles");
StringBuilder paths = new StringBuilder();
- String[] symbNames = requireTldBundles.split(", ");
+ String[] symbNames = requireTldBundles.split("[, ]");
for (String symbName : symbNames)
{
@@ -452,7 +452,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
String tmp = (String)_properties.get(OSGiWebappConstants.JETTY_CONTEXT_FILE_PATH);
if (tmp != null)
{
- String[] filenames = tmp.split(",;");
+ String[] filenames = tmp.split("[,;]");
if (filenames != null && filenames.length > 0)
{
String filename = filenames[0]; //should only be 1 filename in this usage
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
index 65466f506a..6b72ffd48a 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
@@ -125,7 +125,7 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu
//bundle defines JETTY_CONTEXT_FILE_PATH header,
//a comma separated list of context xml files that each define a ContextHandler
//TODO: (could be WebAppContexts)
- String[] tmp = contextFiles.split(",;");
+ String[] tmp = contextFiles.split("[,;]");
for (String contextFile : tmp)
{
String originId = bundle.getSymbolicName() + "-" + bundle.getVersion().toString() + "-"+contextFile;

Back to the top