Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-02-04 19:47:42 +0000
committerJoakim Erdfelt2015-02-04 19:47:42 +0000
commit96ebeed9d969f93c4650b95d25e2801b9c328148 (patch)
tree68ec303eaaf2c26ec3ff8e9010bf08645bd13854 /jetty-websocket
parent2563ef6871fe9886eaae73c0b23b128c60207b9c (diff)
parent741d7891f3f042ee7bc3ac681efa70ffea2b137e (diff)
downloadorg.eclipse.jetty.project-96ebeed9d969f93c4650b95d25e2801b9c328148.tar.gz
org.eclipse.jetty.project-96ebeed9d969f93c4650b95d25e2801b9c328148.tar.xz
org.eclipse.jetty.project-96ebeed9d969f93c4650b95d25e2801b9c328148.zip
Merge branch 'jetty-9.2.x'
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java5
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleObjectTextSocket.java3
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleTextSocket.java3
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatObjectTextSocket.java3
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatTextSocket.java3
5 files changed, 11 insertions, 6 deletions
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
index 8ec623aba4..85d9985677 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Objects;
import javax.websocket.EndpointConfig;
@@ -67,9 +68,9 @@ public class ConfiguredEchoSocket
switch (msg)
{
case "text-max":
- return String.format("%,d",session.getMaxTextMessageBufferSize());
+ return String.format(Locale.US, "%,d",session.getMaxTextMessageBufferSize());
case "binary-max":
- return String.format("%,d",session.getMaxBinaryMessageBufferSize());
+ return String.format(Locale.US, "%,d",session.getMaxBinaryMessageBufferSize());
case "decoders":
return join(config.getDecoders(),", ");
case "encoders":
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleObjectTextSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleObjectTextSocket.java
index baa429977c..eade593f5a 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleObjectTextSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleObjectTextSocket.java
@@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.jsr356.server.samples.primitives;
import java.io.IOException;
+import java.util.Locale;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
@@ -52,7 +53,7 @@ public class DoubleObjectTextSocket
}
else
{
- String msg = String.format("%.4f",d);
+ String msg = String.format(Locale.US, "%.4f",d);
session.getAsyncRemote().sendText(msg);
}
}
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleTextSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleTextSocket.java
index 43c712e03f..71e5e4f154 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleTextSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/DoubleTextSocket.java
@@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.jsr356.server.samples.primitives;
import java.io.IOException;
+import java.util.Locale;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
@@ -46,7 +47,7 @@ public class DoubleTextSocket
@OnMessage
public void onMessage(double d) throws IOException
{
- String msg = String.format("%.4f",d);
+ String msg = String.format(Locale.US, "%.4f",d);
session.getAsyncRemote().sendText(msg);
}
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatObjectTextSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatObjectTextSocket.java
index 2558daa70d..db82622668 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatObjectTextSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatObjectTextSocket.java
@@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.jsr356.server.samples.primitives;
import java.io.IOException;
+import java.util.Locale;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
@@ -52,7 +53,7 @@ public class FloatObjectTextSocket
}
else
{
- String msg = String.format("%.4f",f);
+ String msg = String.format(Locale.US, "%.4f",f);
session.getAsyncRemote().sendText(msg);
}
}
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatTextSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatTextSocket.java
index 1bb6cbefe8..0b5423b2d1 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatTextSocket.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/primitives/FloatTextSocket.java
@@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.jsr356.server.samples.primitives;
import java.io.IOException;
+import java.util.Locale;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
@@ -46,7 +47,7 @@ public class FloatTextSocket
@OnMessage
public void onMessage(float f) throws IOException
{
- String msg = String.format("%.4f",f);
+ String msg = String.format(Locale.US, "%.4f",f);
session.getAsyncRemote().sendText(msg);
}

Back to the top