Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6482 

Adding websocket send timeout to AMQP over websockets
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-11-04 14:09:26 -04:00
parent 450cabe4ea
commit 937b2acd46
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java
View File

@ -237,7 +237,11 @@ public final class WSTransportProxy extends TransportSupport implements Transpor
}
LOG.trace("WS Proxy sending string of size {} out", data.length());
session.getRemote().sendString(data);
try {
session.getRemote().sendStringByFuture(data).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}
}
@Override
@ -253,7 +257,11 @@ public final class WSTransportProxy extends TransportSupport implements Transpor
LOG.trace("WS Proxy sending {} bytes out", data.remaining());
int limit = data.limit();
session.getRemote().sendBytes(data);
try {
session.getRemote().sendBytesByFuture(data).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}
// Reset back to original limit and move position to match limit indicating
// that we read everything, the websocket sender clears the passed buffer
@ -267,4 +275,8 @@ public final class WSTransportProxy extends TransportSupport implements Transpor
private boolean transportStartedAtLeastOnce() {
return socketTransportStarted.getCount() == 0;
}
private static int getDefaultSendTimeOut() {
return Integer.getInteger("org.apache.activemq.transport.ws.WSTransportProxy.sendTimeout", 30);
}
}