QPID-664: change cancel() to close() for consistency

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@903599 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 6 deletions

diff --git a/qpid/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
index 2bd9fcdac8..3834aa3dfd 100644
--- a/qpid/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
@@ -111,7 +111,7 @@ int main(int argc, char** argv)
                 std::cout  << "')" << std::endl;
                 session.acknowledge();
             }
-            receiver.cancel();
+            receiver.close();
             session.close();            
             connection.close();
             return 0;
diff --git a/qpid/cpp/examples/messaging/map_receiver.cpp b/qpid/cpp/examples/messaging/map_receiver.cpp
index f97c44eebd..0106ce878c 100644
--- a/qpid/cpp/examples/messaging/map_receiver.cpp
+++ b/qpid/cpp/examples/messaging/map_receiver.cpp
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
         MapView content(message);
         std::cout << content << std::endl;
         session.acknowledge();
-        receiver.cancel();
+        receiver.close();
         connection.close();
         return 0;
     } catch(const std::exception& error) {
diff --git a/qpid/cpp/examples/messaging/queue_receiver.cpp b/qpid/cpp/examples/messaging/queue_receiver.cpp
index 40f863eb30..058a4e19ae 100644
--- a/qpid/cpp/examples/messaging/queue_receiver.cpp
+++ b/qpid/cpp/examples/messaging/queue_receiver.cpp
@@ -42,8 +42,8 @@ int main(int argc, char** argv) {
             std::cout << "Message: " << message.getContent() << std::endl;
             session.acknowledge();
             if (message.getContent() == "That's all, folks!") {
-                std::cout << "Cancelling receiver" << std::endl;
-                receiver.cancel();
+                std::cout << "Closing receiver" << std::endl;
+                receiver.close();
                 break;
             }
         }
diff --git a/qpid/cpp/examples/messaging/topic_receiver.cpp b/qpid/cpp/examples/messaging/topic_receiver.cpp
index 45ab9448db..321231f93d 100644
--- a/qpid/cpp/examples/messaging/topic_receiver.cpp
+++ b/qpid/cpp/examples/messaging/topic_receiver.cpp
@@ -42,8 +42,8 @@ int main(int argc, char** argv) {
             Message message = receiver.fetch();
             std::cout << "Message: " << message.getContent() << std::endl;
             if (message.getContent() == "That's all, folks!") {
-                std::cout << "Cancelling receiver" << std::endl;
-                receiver.cancel();
+                std::cout << "Closing receiver" << std::endl;
+                receiver.close();
                 break;
             }
         }