From c258b22100ab7f9a52d9da83cf6521a2b7beb642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E6=B0=91=C2=B7=E5=AF=BB=E6=A2=A6=28Pingmin=20Fen?= =?UTF-8?q?lly=20Liu=29?= Date: Thu, 30 Nov 2017 16:22:27 +0800 Subject: [PATCH 1/4] Just align the indentation --- activemq-cpp/src/examples/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp/src/examples/main.cpp b/activemq-cpp/src/examples/main.cpp index 9cc513a82..5565eaa78 100644 --- a/activemq-cpp/src/examples/main.cpp +++ b/activemq-cpp/src/examples/main.cpp @@ -386,7 +386,7 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) { long long startTime = System::currentTimeMillis(); HelloWorldProducer producer(brokerURI, numMessages, useTopics); - HelloWorldConsumer consumer(brokerURI, numMessages, useTopics, sessionTransacted); + HelloWorldConsumer consumer(brokerURI, numMessages, useTopics, sessionTransacted); // Start the consumer thread. Thread consumerThread(&consumer); From a6aa67d7ed97e31589d0778de7fde46e7f0b5bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E6=B0=91=C2=B7=E5=AF=BB=E6=A2=A6=28Pingmin=20Fen?= =?UTF-8?q?lly=20Liu=29?= Date: Thu, 30 Nov 2017 16:23:16 +0800 Subject: [PATCH 2/4] Fix the typo error of "new" --- activemq-cpp/src/main/cms/MessageConsumer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activemq-cpp/src/main/cms/MessageConsumer.h b/activemq-cpp/src/main/cms/MessageConsumer.h index 6ae878b30..5734dbd92 100644 --- a/activemq-cpp/src/main/cms/MessageConsumer.h +++ b/activemq-cpp/src/main/cms/MessageConsumer.h @@ -105,7 +105,7 @@ namespace cms { virtual void setMessageListener(MessageListener* listener) = 0; /** - * Gets the MessageListener that this class will send mew Message + * Gets the MessageListener that this class will send new Message * notification events to. * * @return The listener of messages received by this consumer @@ -155,7 +155,7 @@ namespace cms { virtual void setMessageAvailableListener(cms::MessageAvailableListener* listener) = 0; /** - * Gets the MessageAvailableListener that this class will send mew Message + * Gets the MessageAvailableListener that this class will send new Message * notification events to. * * @return The listener of message events received by this consumer. From f31a8a6d7ecffea3597baf9a8df3d87fb9ebf2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E6=B0=91=C2=B7=E5=AF=BB=E6=A2=A6=28Pingmin=20Fen?= =?UTF-8?q?lly=20Liu=29?= Date: Thu, 30 Nov 2017 17:04:48 +0800 Subject: [PATCH 3/4] Fix the typo error of "Then" --- activemq-cpp/src/examples/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp/src/examples/main.cpp b/activemq-cpp/src/examples/main.cpp index 5565eaa78..02a2b29ea 100644 --- a/activemq-cpp/src/examples/main.cpp +++ b/activemq-cpp/src/examples/main.cpp @@ -359,7 +359,7 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) { // System::setProperty( "decaf.net.ssl.keyStorePassword", "password" ); // System::setProperty( "decaf.net.ssl.trustStore", "/rootCA.pem" ); // - // The you just specify the ssl transport in the URI, for example: + // Then you just specify the ssl transport in the URI, for example: // // ssl://localhost:61617 // From deec51675cb6f399a8ca9e0880bd62406889a28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E6=B0=91=C2=B7=E5=AF=BB=E6=A2=A6=28Pingmin=20Fen?= =?UTF-8?q?lly=20Liu=29?= Date: Fri, 1 Dec 2017 16:35:53 +0800 Subject: [PATCH 4/4] Use "this->messageListener" to distinguish from the input argument --- activemq-cpp/src/examples/stress-test/Receiver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp/src/examples/stress-test/Receiver.cpp b/activemq-cpp/src/examples/stress-test/Receiver.cpp index 6814af87c..6e48a28a3 100644 --- a/activemq-cpp/src/examples/stress-test/Receiver.cpp +++ b/activemq-cpp/src/examples/stress-test/Receiver.cpp @@ -194,7 +194,7 @@ void Receiver::registerMessageListener(ReceiverListener* messageListener, ErrorC return; } - if (messageListener != NULL) { + if (this->messageListener != NULL) { errorCode = CMS_ERROR_A_MESSAGELISTENER_HAS_BEEN_REGISTERED_ALREADY; mutexGeneral.unlock(); return;