Author: tabish
Date: Mon Oct 4 15:23:38 2010
New Revision: 1004285
URL: http://svn.apache.org/viewvc?rev=1004285&view=rev
Log:
fix for: https://issues.apache.org/activemq/browse/AMQCPP-319
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
Mon Oct 4 15:23:38 2010
@@ -58,3 +58,9 @@ std::string ActiveMQQueue::toString() co
bool ActiveMQQueue::equals( const DataStructure* value ) const {
return ActiveMQDestination::equals( value );
}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ActiveMQQueue::equals( const cms::Destination& value ) const {
+ const ActiveMQDestination* dest = dynamic_cast<const
ActiveMQDestination*>( &value );
+ return ActiveMQDestination::equals( dest );
+}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
Mon Oct 4 15:23:38 2010
@@ -88,6 +88,8 @@ namespace commands{
return this->getOptions();
}
+ virtual bool equals( const cms::Destination& other ) const;
+
public: // CMS Queue
virtual std::string getQueueName() const {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
Mon Oct 4 15:23:38 2010
@@ -68,6 +68,12 @@ bool ActiveMQTempQueue::equals( const Da
}
////////////////////////////////////////////////////////////////////////////////
+bool ActiveMQTempQueue::equals( const cms::Destination& value ) const {
+ const ActiveMQDestination* dest = dynamic_cast<const
ActiveMQDestination*>( &value );
+ return ActiveMQDestination::equals( dest );
+}
+
+////////////////////////////////////////////////////////////////////////////////
void ActiveMQTempQueue::destroy() {
try{
close();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
Mon Oct 4 15:23:38 2010
@@ -84,6 +84,8 @@ namespace commands{
return this->getOptions();
}
+ virtual bool equals( const cms::Destination& other ) const;
+
public:
virtual std::string getQueueName() const {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
Mon Oct 4 15:23:38 2010
@@ -67,6 +67,12 @@ bool ActiveMQTempTopic::equals( const Da
}
////////////////////////////////////////////////////////////////////////////////
+bool ActiveMQTempTopic::equals( const cms::Destination& value ) const {
+ const ActiveMQDestination* dest = dynamic_cast<const
ActiveMQDestination*>( &value );
+ return ActiveMQDestination::equals( dest );
+}
+
+////////////////////////////////////////////////////////////////////////////////
void ActiveMQTempTopic::destroy() {
try{
close();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
Mon Oct 4 15:23:38 2010
@@ -84,6 +84,8 @@ namespace commands{
return this->getOptions();
}
+ virtual bool equals( const cms::Destination& other ) const;
+
public: // CMS Temporary Topic
virtual std::string getTopicName() const {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
Mon Oct 4 15:23:38 2010
@@ -56,3 +56,14 @@ void ActiveMQTopic::copyDataStructure( c
std::string ActiveMQTopic::toString() const {
return ActiveMQDestination::toString();
}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ActiveMQTopic::equals( const DataStructure* value ) const {
+ return ActiveMQDestination::equals( value );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ActiveMQTopic::equals( const cms::Destination& value ) const {
+ const ActiveMQDestination* dest = dynamic_cast<const
ActiveMQDestination*>( &value );
+ return ActiveMQDestination::equals( dest );
+}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
Mon Oct 4 15:23:38 2010
@@ -60,9 +60,7 @@ namespace commands{
virtual std::string toString() const;
- virtual bool equals( const DataStructure* value ) const {
- return ActiveMQDestination::equals( value );
- }
+ virtual bool equals( const DataStructure* value ) const;
virtual const cms::Destination* getCMSDestination() const {
return this;
@@ -88,6 +86,8 @@ namespace commands{
return this->getOptions();
}
+ virtual bool equals( const cms::Destination& other ) const;
+
public: // CMS Topic
virtual std::string getTopicName() const {
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h?rev=1004285&r1=1004284&r2=1004285&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h Mon Oct
4 15:23:38 2010
@@ -74,6 +74,17 @@ namespace cms{
virtual void copy( const cms::Destination& source ) = 0;
/**
+ * Compares two Destination instances to determine if they represent
the same
+ * logic Destination.
+ *
+ * @param other
+ * The other destination to compare this one to.
+ *
+ * @return true if the two destinations are the same.
+ */
+ virtual bool equals( const cms::Destination& other ) const = 0;
+
+ /**
* Retrieve any properties that might be part of the destination
* that was specified. This is a deviation from the JMS spec
* but necessary due to C++ restrictions.
