Return-Path: 
 <commits-return-12287-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 1371 invoked from network); 16 Nov 2009 21:45:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 16 Nov 2009 21:45:49 -0000
Received: (qmail 54131 invoked by uid 500); 16 Nov 2009 21:45:46 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 54082 invoked by uid 500); 16 Nov 2009 21:45:46 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 53971 invoked by uid 99); 16 Nov 2009 21:45:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2009 21:45:46 +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; Mon, 16 Nov 2009 21:45:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3B8E52388901; Mon, 16 Nov 2009 21:45:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r880978 - in
 /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity:
 InactivityMonitor.cpp InactivityMonitor.h
Date: Mon, 16 Nov 2009 21:45:22 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091116214522.3B8E52388901@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Mon Nov 16 21:45:21 2009
New Revision: 880978

URL: http://svn.apache.org/viewvc?rev=880978&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-250

Add an additional constructor that accepts a Properties object which is used to read settings for the options not set by value in the WireFormatInfo command.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp?rev=880978&r1=880977&r2=880978&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp Mon Nov 16 21:45:21 2009
@@ -28,6 +28,7 @@
 #include <decaf/lang/Math.h>
 #include <decaf/lang/Thread.h>
 #include <decaf/lang/Runnable.h>
+#include <decaf/lang/Boolean.h>
 
 using namespace std;
 using namespace activemq;
@@ -186,6 +187,26 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+InactivityMonitor::InactivityMonitor( const Pointer<Transport>& next,
+                                      const decaf::util::Properties& properties,
+                                      const Pointer<wireformat::WireFormat>& wireFormat )
+:   TransportFilter( next ), members( new InactivityMonitorData() ) {
+
+    this->members->wireFormat = wireFormat;
+    this->members->monitorStarted = false;
+    this->members->commandSent = false;
+    this->members->commandReceived = true;
+    this->members->failed = false;
+    this->members->inRead = false;
+    this->members->inWrite = false;
+    this->members->readCheckTime = 0;
+    this->members->writeCheckTime = 0;
+    this->members->initialDelayTime = 0;
+    this->members->keepAliveResponseRequired =
+        Boolean::parseBoolean( properties.getProperty( "keepAliveResponseRequired", false ) );
+}
+
+////////////////////////////////////////////////////////////////////////////////
 InactivityMonitor::~InactivityMonitor() {
     try{
         this->stopMonitorThreads();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h?rev=880978&r1=880977&r2=880978&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h Mon Nov 16 21:45:21 2009
@@ -28,6 +28,7 @@
 
 #include <decaf/lang/Pointer.h>
 #include <decaf/util/Timer.h>
+#include <decaf/util/Properties.h>
 #include <decaf/util/concurrent/atomic/AtomicBoolean.h>
 
 #include <memory>
@@ -57,13 +58,12 @@
 
     public:
 
-        /**
-         * Constructor
-         *
-         * @param next
-         *      The Transport instance that this TransportFilter wraps.
-         */
-        InactivityMonitor( const Pointer<Transport>& next, const Pointer<wireformat::WireFormat>& wireFormat );
+        InactivityMonitor( const Pointer<Transport>& next,
+                           const Pointer<wireformat::WireFormat>& wireFormat );
+
+        InactivityMonitor( const Pointer<Transport>& next,
+                           const decaf::util::Properties& properties,
+                           const Pointer<wireformat::WireFormat>& wireFormat );
 
         virtual ~InactivityMonitor();