You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/10/29 00:58:03 UTC
svn commit: r1711166 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Author: rgodfrey
Date: Wed Oct 28 23:58:03 2015
New Revision: 1711166
URL: http://svn.apache.org/viewvc?rev=1711166&view=rev
Log:
QPID-6810 : WebSocket provider fixes
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java?rev=1711166&r1=1711165&r2=1711166&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java Wed Oct 28 23:58:03 2015
@@ -272,7 +272,10 @@ public abstract class AbstractAMQPConnec
public void setScheduler(final NetworkConnectionScheduler networkConnectionScheduler)
{
- ((NonBlockingConnection)_network).changeScheduler(networkConnectionScheduler);
+ if(_network instanceof NonBlockingConnection)
+ {
+ ((NonBlockingConnection) _network).changeScheduler(networkConnectionScheduler);
+ }
}
public String getClientProduct()
Modified: qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1711166&r1=1711165&r2=1711166&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java (original)
+++ qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java Wed Oct 28 23:58:03 2015
@@ -257,6 +257,8 @@ class WebSocketProvider implements Accep
_protocolEngine = _factory.newProtocolEngine(_remoteAddress);
+ connection.setMaxBinaryMessageSize(0);
+
_connectionWrapper =
new ConnectionWrapper(connection, _localAddress, _remoteAddress, _protocolEngine);
_connectionWrapper.setPeerCertificate(_userCertificate);
@@ -417,13 +419,16 @@ class WebSocketProvider implements Accep
tmp.dispose();
offset += remaining;
}
- try
- {
- _connection.sendMessage(data,0,size);
- }
- catch (IOException e)
+ if(size > 0)
{
- close();
+ try
+ {
+ _connection.sendMessage(data, 0, size);
+ }
+ catch (IOException e)
+ {
+ close();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org