From commits-return-11547-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Aug 07 16:49:26 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 67928 invoked from network); 7 Aug 2009 16:49:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Aug 2009 16:49:25 -0000 Received: (qmail 18787 invoked by uid 500); 7 Aug 2009 16:49:33 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 18759 invoked by uid 500); 7 Aug 2009 16:49:33 -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 18750 invoked by uid 99); 7 Aug 2009 16:49:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Aug 2009 16:49:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 07 Aug 2009 16:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 426C52388882; Fri, 7 Aug 2009 16:49:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r802086 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport: InactivityMonitor.java tcp/TcpTransportFactory.java Date: Fri, 07 Aug 2009 16:49:08 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090807164908.426C52388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Fri Aug 7 16:49:07 2009 New Revision: 802086 URL: http://svn.apache.org/viewvc?rev=802086&view=rev Log: make keepAliveResponseRequired optional in the inactivity monitor - https://issues.apache.org/activemq/browse/AMQ-2351 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java?rev=802086&r1=802085&r2=802086&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java Fri Aug 7 16:49:07 2009 @@ -62,7 +62,7 @@ private long readCheckTime; private long writeCheckTime; private long initialDelayTime; - + private boolean keepAliveResponseRequired; private WireFormat wireFormat; private final Runnable readChecker = new Runnable() { @@ -126,7 +126,7 @@ } if (!commandSent.get()) { - if(LOG.isTraceEnabled()) { + if (LOG.isTraceEnabled()) { LOG.trace("No message sent since last write check, sending a KeepAliveInfo"); } ASYNC_TASKS.execute(new Runnable() { @@ -135,7 +135,7 @@ try { KeepAliveInfo info = new KeepAliveInfo(); - info.setResponseRequired(true); + info.setResponseRequired(keepAliveResponseRequired); oneway(info); } catch (IOException e) { onException(e); @@ -247,7 +247,11 @@ stopMonitorThreads(); transportListener.onException(error); } - } + } + + public void setKeepAliveResponseRequired(boolean val) { + keepAliveResponseRequired = val; + } private synchronized void startMonitorThreads() throws IOException { if (monitorStarted.get()) { @@ -266,7 +270,7 @@ monitorStarted.set(true); writeCheckerTask = new SchedulerTimerTask(writeChecker); readCheckerTask = new SchedulerTimerTask(readChecker); - writeCheckTime = readCheckTime/3; + writeCheckTime = readCheckTime>3 ? readCheckTime/3 : readCheckTime; synchronized( InactivityMonitor.class ) { if( CHECKER_COUNTER == 0 ) { READ_CHECK_TIMER = new Timer("InactivityMonitor ReadCheck",true); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java?rev=802086&r1=802085&r2=802086&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java Fri Aug 7 16:49:07 2009 @@ -99,7 +99,9 @@ boolean useInactivityMonitor = "true".equals(getOption(options, "useInactivityMonitor", "true")); if (useInactivityMonitor && isUseInactivityMonitor(transport)) { transport = new InactivityMonitor(transport, format); + IntrospectionSupport.setProperties(transport, options); } + // Only need the WireFormatNegotiator if using openwire if (format instanceof OpenWireFormat) {