1 files changed, 17 insertions, 1 deletions

diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp
index ee5e92aed55..feb41117819 100644
--- a/cpp/demo/Ice/invoke/Client.cpp
+++ b/cpp/demo/Ice/invoke/Client.cpp
@@ -87,7 +87,9 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 out->write("The streaming API works!");
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -105,12 +107,14 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 Demo::StringSeq arr;
                 arr.push_back("The");
                 arr.push_back("streaming");
                 arr.push_back("API");
                 arr.push_back("works!");
                 out->write(arr);
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -128,10 +132,12 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 Demo::StringDict dict;
                 dict["The"] = "streaming";
                 dict["API"] = "works!";
                 out->write(dict);
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -149,7 +155,9 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 out->write(Demo::green);
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -167,10 +175,12 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 Demo::Structure s;
                 s.name = "red";
                 s.value = Demo::red;
                 out->write(s);
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -188,6 +198,7 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 Demo::StructureSeq arr;
                 arr.push_back(Demo::Structure());
                 arr.back().name = "red";
@@ -199,6 +210,7 @@ InvokeClient::run(int argc, char* argv[])
                 arr.back().name = "blue";
                 arr.back().value = Demo::blue;
                 out->write(arr);
+                out->endEncapsulation();
                 out->finished(inParams);
 
                 //
@@ -216,10 +228,12 @@ InvokeClient::run(int argc, char* argv[])
                 //
                 Ice::ByteSeq inParams, outParams;
                 Ice::OutputStreamPtr out = Ice::createOutputStream(communicator());
+                out->startEncapsulation();
                 Demo::CPtr c = new Demo::C;
                 c->s.name = "blue";
                 c->s.value = Demo::blue;
                 out->write(c);
+                out->endEncapsulation();
                 out->writePendingObjects();
                 out->finished(inParams);
 
@@ -247,11 +261,12 @@ InvokeClient::run(int argc, char* argv[])
                 // Unmarshal the results.
                 //
                 Ice::InputStreamPtr in = Ice::createInputStream(communicator(), outParams);
+                in->startEncapsulation();
                 Demo::CPtr c;
                 in->read(c);
                 string str;
                 in->read(str);
-                in->readPendingObjects();
+                in->endEncapsulation();
                 cout << "Got string `" << str << "' and class: s.name=" << c->s.name
                      << ", s.value=" << c->s.value << endl;
             }
@@ -268,6 +283,7 @@ InvokeClient::run(int argc, char* argv[])
                 }
 
                 Ice::InputStreamPtr in = Ice::createInputStream(communicator(), outParams);
+                in->startEncapsulation();
                 try
                 {
                     in->throwException();