Author: tabish
Date: Wed Apr 20 23:42:03 2011
New Revision: 1095559
URL: http://svn.apache.org/viewvc?rev=1095559&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQCPP-363
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionState.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionState.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionState.h?rev=1095559&r1=1095558&r2=1095559&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionState.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionState.h
Wed Apr 20 23:42:03 2011
@@ -141,7 +141,7 @@ namespace state {
return sessions.values();
}
- StlMap< Pointer<ConsumerId>, Pointer<ConsumerInfo>,
ConsumerId::COMPARATOR > getRecoveringPullConsumers() {
+ StlMap< Pointer<ConsumerId>, Pointer<ConsumerInfo>,
ConsumerId::COMPARATOR >& getRecoveringPullConsumers() {
return recoveringPullConsumers;
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp?rev=1095559&r1=1095558&r2=1095559&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/state/ConnectionStateTracker.cpp
Wed Apr 20 23:42:03 2011
@@ -824,17 +824,8 @@ void ConnectionStateTracker::connectionI
control->setDestination( stalledConsumers.get( *key
)->getDestination() );
try {
-
- //if( LOG.isDebugEnabled() ) {
- // LOG.debug("restored recovering consumer: " +
control.getConsumerId() +
- // " with: " + control.getPrefetch());
- //}
transport->oneway( control );
} catch( Exception& ex ) {
- //if( LOG.isDebugEnabled() ) {
- // LOG.debug("Failed to submit control for consumer: " +
control.getConsumerId() +
- // " with: " + control.getPrefetch(), ex);
- //}
}
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp?rev=1095559&r1=1095558&r2=1095559&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
Wed Apr 20 23:42:03 2011
@@ -97,7 +97,10 @@ Pointer<Transport> TcpTransportFactory::
}
// If command tracing was enabled, wrap the transport with a logging
transport.
+ // We support the old CMS value, the ActiveMQ trace value and the NMS
useLogging
+ // value in order to be more friendly.
if( properties.getProperty( "transport.commandTracingEnabled", "false"
) == "true" ||
+ properties.getProperty( "transport.useLogging", "false" ) ==
"true" ||
properties.getProperty( "transport.trace", "false" ) == "true" ) {
// Create the Transport for response correlator
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp?rev=1095559&r1=1095558&r2=1095559&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
Wed Apr 20 23:42:03 2011
@@ -44,7 +44,7 @@ Pointer<WireFormat> OpenWireFormatFactor
// Configure the version to use
info->setVersion( Integer::parseInt(
- properties.getProperty( "wireFormat.version", "5" ) ) );
+ properties.getProperty( "wireFormat.version", "6" ) ) );
// parse params out of the properties
info->setStackTraceEnabled( Boolean::parseBoolean(
