4 files changed, 4 insertions, 20 deletions
diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp
index ca5af8c37a8..5e47de556d5 100644
--- a/cpp/demo/Glacier/session/Client.cpp
+++ b/cpp/demo/Glacier/session/Client.cpp
@@ -176,11 +176,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	    }
 	    else if(c == 'f')
 	    {
-		batchOneway->ice_flush();
-                if(!secure)
-                {
-                    batchDatagram->ice_flush();
-                }
+		communicator->flushBatchRequests();
 	    }
 	    else if(c == 'T')
 	    {
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 45401b1a861..e0b6c667465 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -156,11 +156,7 @@ CallbackClient::run(int argc, char* argv[])
 	    }
 	    else if(c == 'f')
 	    {
-		batchOneway->ice_flush();
-                if(!secure)
-                {
-                    batchDatagram->ice_flush();
-                }
+		communicator()->flushBatchRequests();
 	    }
 	    else if(c == 'S')
 	    {
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 66b8e7deed9..1f63bf78ab0 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -107,11 +107,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	    }
 	    else if(c == 'f')
 	    {
-		batchOneway->ice_flush();
- 		if(!secure)
-		{
-		    batchDatagram->ice_flush();
-		}
+		communicator->flushBatchRequests();
 	    }
 	    else if(c == 'T')
 	    {
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 95867585949..365267b0799 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -106,11 +106,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	    }
 	    else if(c == 'f')
 	    {
-		batchOneway->ice_flush();
-		if(!secure)
-		{
-		    batchDatagram->ice_flush();
-		}
+		communicator->flushBatchRequests();
 	    }
 	    else if(c == 'T')
 	    {