You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/08/16 13:32:03 UTC
svn commit: r1373795 -
/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
Author: chirino
Date: Thu Aug 16 11:32:02 2012
New Revision: 1373795
URL: http://svn.apache.org/viewvc?rev=1373795&view=rev
Log:
Fixes websocket test failure introduced due to recent changes.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala?rev=1373795&r1=1373794&r2=1373795&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala Thu Aug 16 11:32:02 2012
@@ -202,8 +202,11 @@ object WebSocketTransportFactory extends
// Transport interface methods.
/////////////////////////////////////////////////////////////////////////
- @BeanProperty
- var blockingExecutor:Executor = _
+ def blockingExecutor:Executor = server.blockingExecutor
+
+ def getBlockingExecutor = blockingExecutor
+ def setBlockingExecutor(value: Executor) {
+ }
var dispatchQueue = createQueue()