Skip to content

Commit 91fcd34

Browse files
author
elyran
committed
update jetty version & send sync
1 parent 09ee14b commit 91fcd34

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<url>http://maven.apache.org</url>
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<jetty.version>9.2.9.v20150224</jetty.version>
15+
<jetty.version>9.2.14.v20151106</jetty.version>
1616
<jMeter.version>2.13</jMeter.version>
1717
</properties>
1818
<build>

src/main/java/JMeter/plugins/functional/samplers/websocket/ServiceSocket.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,32 @@
44
*/
55
package JMeter.plugins.functional.samplers.websocket;
66

7-
import java.io.IOException;
8-
import java.text.SimpleDateFormat;
9-
import java.util.Date;
10-
import java.util.Deque;
11-
import java.util.concurrent.ConcurrentLinkedDeque;
12-
import java.util.concurrent.CountDownLatch;
13-
import java.util.concurrent.TimeUnit;
14-
15-
import org.apache.log.Logger;
16-
17-
import java.util.concurrent.atomic.AtomicInteger;
18-
import java.util.regex.Pattern;
19-
207
import org.apache.jmeter.engine.util.CompoundVariable;
218
import org.apache.jorphan.logging.LoggingManager;
9+
import org.apache.log.Logger;
10+
import org.eclipse.jetty.websocket.api.BatchMode;
2211
import org.eclipse.jetty.websocket.api.Session;
2312
import org.eclipse.jetty.websocket.api.StatusCode;
2413
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
2514
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
26-
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame;
2715
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
2816
import org.eclipse.jetty.websocket.api.annotations.WebSocket;
29-
import org.eclipse.jetty.websocket.api.extensions.Frame;
3017
import org.eclipse.jetty.websocket.client.WebSocketClient;
3118

19+
import java.io.IOException;
20+
import java.text.SimpleDateFormat;
21+
import java.util.Date;
22+
import java.util.Deque;
23+
import java.util.concurrent.ConcurrentLinkedDeque;
24+
import java.util.concurrent.CountDownLatch;
25+
import java.util.concurrent.TimeUnit;
26+
import java.util.concurrent.atomic.AtomicInteger;
27+
import java.util.regex.Pattern;
28+
3229
/**
33-
*
3430
* @author Maciej Zaleski
3531
*/
36-
@WebSocket(maxTextMessageSize = 256 * 1024 * 1024)
32+
@WebSocket(batchMode = BatchMode.OFF, maxTextMessageSize = 256 * 1024 * 1024)
3733
public class ServiceSocket {
3834

3935
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
@@ -159,7 +155,7 @@ public Session getSession() {
159155
}
160156

161157
public void sendMessage(String message) throws IOException {
162-
session.getRemote().sendStringByFuture(message);
158+
session.getRemote().sendString(message);
163159
}
164160

165161
public void close() {

0 commit comments

Comments
 (0)