You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/11/09 15:24:14 UTC
svn commit: r593534 - in
/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands:
ActiveMQDestination.cpp ActiveMQMapMessage.cpp
Author: tabish
Date: Fri Nov 9 06:24:14 2007
New Revision: 593534
URL: http://svn.apache.org/viewvc?rev=593534&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?rev=593534&r1=593533&r2=593534&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp Fri Nov 9 06:24:14 2007
@@ -21,10 +21,10 @@
using namespace std;
using namespace activemq;
using namespace activemq::util;
-using namespace activemq::exceptions;
using namespace activemq::connector;
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang;
////////////////////////////////////////////////////////////////////////////////
const std::string ActiveMQDestination::ADVISORY_PREFIX = "ActiveMQ.Advisory.";
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp?rev=593534&r1=593533&r2=593534&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp Fri Nov 9 06:24:14 2007
@@ -18,6 +18,9 @@
#include <activemq/connector/openwire/marshal/PrimitiveMapMarshaller.h>
using namespace std;
+using namespace decaf;
+using namespace decaf::lang;
+using namespace decaf::lang::exceptions;
using namespace activemq;
using namespace activemq::util;
using namespace activemq::exceptions;
@@ -67,19 +70,19 @@
}
////////////////////////////////////////////////////////////////////////////////
-util::PrimitiveMap& ActiveMQMapMessage::getMap() throw ( NullPointerException ) {
+PrimitiveMap& ActiveMQMapMessage::getMap() throw ( NullPointerException ) {
try{
this->checkMapIsUnmarshalled();
return *map;
}
- AMQ_CATCH_RETHROW( exceptions::NullPointerException )
- AMQ_CATCHALL_THROW( exceptions::NullPointerException )
+ AMQ_CATCH_RETHROW( NullPointerException )
+ AMQ_CATCHALL_THROW( NullPointerException )
}
////////////////////////////////////////////////////////////////////////////////
-const util::PrimitiveMap& ActiveMQMapMessage::getMap() const
+const PrimitiveMap& ActiveMQMapMessage::getMap() const
throw ( decaf::lang::exceptions::NullPointerException ) {
try{
@@ -87,8 +90,8 @@
this->checkMapIsUnmarshalled();
return *map;
}
- AMQ_CATCH_RETHROW( exceptions::NullPointerException )
- AMQ_CATCHALL_THROW( exceptions::NullPointerException )
+ AMQ_CATCH_RETHROW( NullPointerException )
+ AMQ_CATCHALL_THROW( NullPointerException )
}
////////////////////////////////////////////////////////////////////////////////
@@ -114,8 +117,8 @@
}
}
}
- AMQ_CATCH_RETHROW( exceptions::NullPointerException )
- AMQ_CATCHALL_THROW( exceptions::NullPointerException )
+ AMQ_CATCH_RETHROW( NullPointerException )
+ AMQ_CATCHALL_THROW( NullPointerException )
}
////////////////////////////////////////////////////////////////////////////////