Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-06-19 02:48:53 -0400
committerJoakim Erdfelt2015-12-08 16:54:33 -0500
commit3527c6a71b7247edc8ba92352b706679d958efd7 (patch)
treed78612753c8e1dfde4052127b4fd96e816b3b4c7 /jetty-websocket
parente6f23a692ec3a7472965100854a7ade69733c71c (diff)
downloadorg.eclipse.jetty.project-3527c6a71b7247edc8ba92352b706679d958efd7.tar.gz
org.eclipse.jetty.project-3527c6a71b7247edc8ba92352b706679d958efd7.tar.xz
org.eclipse.jetty.project-3527c6a71b7247edc8ba92352b706679d958efd7.zip
StringUtil.csvSplit(String)
Conflicts: jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java
index ace05d8205..8540689a72 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java
@@ -132,7 +132,7 @@ public class JsrBrowserSocket
}
case "many":
{
- String parts[] = val.split(",");
+ String parts[] = StringUtil.csvSplit(val);
int size = Integer.parseInt(parts[0]);
int count = Integer.parseInt(parts[1]);
@@ -141,7 +141,7 @@ public class JsrBrowserSocket
}
case "manythreads":
{
- String parts[] = val.split(",");
+ String parts[] = StringUtil.csvSplit(val);
int threadCount = Integer.parseInt(parts[0]);
int size = Integer.parseInt(parts[1]);
int count = Integer.parseInt(parts[2]);

Back to the top