Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 18FDDD5A6 for ; Thu, 16 Aug 2012 11:32:50 +0000 (UTC) Received: (qmail 10824 invoked by uid 500); 16 Aug 2012 11:32:49 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 10797 invoked by uid 500); 16 Aug 2012 11:32:49 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 10707 invoked by uid 99); 16 Aug 2012 11:32:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 11:32:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 11:32:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C51A23889EB for ; Thu, 16 Aug 2012 11:32:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1373795 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala Date: Thu, 16 Aug 2012 11:32:03 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120816113203.3C51A23889EB@eris.apache.org> 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()