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 066CC10B50 for ; Thu, 25 Jul 2013 09:40:58 +0000 (UTC) Received: (qmail 87633 invoked by uid 500); 25 Jul 2013 09:40:55 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 87577 invoked by uid 500); 25 Jul 2013 09:40:54 -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 87569 invoked by uid 99); 25 Jul 2013 09:40:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jul 2013 09:40:52 +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, 25 Jul 2013 09:40:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6848B238889B; Thu, 25 Jul 2013 09:40:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1506864 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala Date: Thu, 25 Jul 2013 09:40:29 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130725094029.6848B238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Thu Jul 25 09:40:28 2013 New Revision: 1506864 URL: http://svn.apache.org/r1506864 Log: More fixes for APLO-325: Applying Christian Posta's patch which allows making the WS message size configurable. 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=1506864&r1=1506863&r2=1506864&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 Jul 25 09:40:28 2013 @@ -84,8 +84,17 @@ object WebSocketTransportFactory extends @BeanProperty var cors_origin:String = null + @BeanProperty + var max_text_message_size: Int = -1 + + @BeanProperty + var max_binary_message_size:Int = -1 + + @BeanProperty + var max_idle_time: Int = -1 + var broker: Broker = _ - var blocking_executor: Executor = _ + def set_broker(value: Broker) = broker = value @@ -206,6 +215,17 @@ object WebSocketTransportFactory extends def fire_accept = accept_dispatch_queue { val transport = pending_connects.poll() + + if(max_text_message_size != -1){ + transport.connection.setMaxTextMessageSize(max_text_message_size) + } + if(max_binary_message_size != -1){ + transport.connection.setMaxBinaryMessageSize(max_binary_message_size) + } + if(max_idle_time != -1){ + transport.connection.setMaxIdleTime(max_idle_time) + } + if (transport != null) { if (service_state.is_started) { transportServerListener.onAccept(transport)