Skip to content

Commit be8ebe8

Browse files
committed
Deprected iothread restriction on acceptor, using default
1 parent bce1674 commit be8ebe8

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>websocket</artifactId>
1010
<packaging>jar</packaging>
1111
<name>websocket</name>
12-
<version>1.16.0</version>
12+
<version>1.16.2</version>
1313
<description>Red5 WebSocket plugin</description>
1414
<url>https://github.com/Red5/red5-websocket</url>
1515
<organization>

src/main/java/org/red5/net/websocket/WebSocketConnection.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Optional;
2727
import java.util.concurrent.atomic.AtomicBoolean;
2828

29+
import org.apache.commons.lang3.StringUtils;
2930
import org.apache.mina.core.buffer.IoBuffer;
3031
import org.apache.mina.core.future.CloseFuture;
3132
import org.apache.mina.core.future.IoFutureListener;
@@ -139,14 +140,17 @@ public void receive(WSMessage message) {
139140
/**
140141
* Sends text to the client.
141142
*
142-
* @param data
143-
* string data
143+
* @param data string data
144144
* @throws UnsupportedEncodingException
145145
*/
146146
public void send(String data) throws UnsupportedEncodingException {
147147
log.trace("send message: {}", data);
148-
Packet packet = Packet.build(data.getBytes("UTF8"), MessageType.TEXT);
149-
session.write(packet);
148+
if (StringUtils.isNotBlank(data)) {
149+
Packet packet = Packet.build(data.getBytes("UTF8"), MessageType.TEXT);
150+
session.write(packet);
151+
} else {
152+
throw new UnsupportedEncodingException("Cannot send a null string");
153+
}
150154
}
151155

152156
/**

src/main/java/org/red5/net/websocket/WebSocketTransport.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ public class WebSocketTransport implements InitializingBean, DisposableBean {
5555

5656
private int receiveBufferSize = 2048;
5757

58-
@SuppressWarnings("unused")
59-
private int connectionThreads = 8;
60-
61-
private int ioThreads = 16;
62-
6358
private int port = 80;
6459

6560
private Set<String> addresses = new HashSet<>();
@@ -87,7 +82,7 @@ public class WebSocketTransport implements InitializingBean, DisposableBean {
8782
@Override
8883
public void afterPropertiesSet() throws Exception {
8984
// create the nio acceptor
90-
acceptor = new NioSocketAcceptor(ioThreads);
85+
acceptor = new NioSocketAcceptor();
9186
// configure the acceptor
9287
SocketSessionConfig sessionConf = acceptor.getSessionConfig();
9388
sessionConf.setReuseAddress(true);
@@ -197,19 +192,17 @@ public void setReceiveBufferSize(int receiveBufferSize) {
197192
}
198193

199194
/**
200-
* @param connectionThreads
201-
* the connectionThreads to set
195+
* @param connectionThreads the connectionThreads to set
202196
*/
197+
@Deprecated
203198
public void setConnectionThreads(int connectionThreads) {
204-
this.connectionThreads = connectionThreads;
205199
}
206200

207201
/**
208-
* @param ioThreads
209-
* the ioThreads to set
202+
* @param ioThreads the ioThreads to set
210203
*/
204+
@Deprecated
211205
public void setIoThreads(int ioThreads) {
212-
this.ioThreads = ioThreads;
213206
}
214207

215208
public boolean isSecure() {

0 commit comments

Comments
 (0)