demo fixes

2 files changed, 30 insertions, 8 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();
diff --git a/cpp/demo/Ice/invoke/PrinterI.cpp b/cpp/demo/Ice/invoke/PrinterI.cpp
index b0f38778331..c544ab7fef2 100644
--- a/cpp/demo/Ice/invoke/PrinterI.cpp
+++ b/cpp/demo/Ice/invoke/PrinterI.cpp
@@ -35,16 +35,14 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
 {
     Ice::CommunicatorPtr communicator = current.adapter->getCommunicator();
 
-    Ice::InputStreamPtr in;
-    if(inParams.size() > 0)
-    {
-        in = Ice::createInputStream(communicator, inParams);
-    }
+    Ice::InputStreamPtr in = Ice::createInputStream(communicator, inParams);
+    in->startEncapsulation();
 
     if(current.operation == "printString")
     {
         string message;
         in->read(message);
+        in->endEncapsulation();
         cout << "Printing string `" << message << "'" << endl;
         return true;
     }
@@ -52,6 +50,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::StringSeq seq;
         in->read(seq);
+        in->endEncapsulation();
         cout << "Printing string sequence {";
         for(Demo::StringSeq::iterator p = seq.begin(); p != seq.end(); ++p)
         {
@@ -68,6 +67,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::StringDict dict;
         in->read(dict);
+        in->endEncapsulation();
         cout << "Printing dictionary {";
         for(Demo::StringDict::iterator p = dict.begin(); p != dict.end(); ++p)
         {
@@ -84,6 +84,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::Color c;
         in->read(c);
+        in->endEncapsulation();
         cout << "Printing enum " << c << endl;
         return true;
     }
@@ -91,6 +92,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::Structure s;
         in->read(s);
+        in->endEncapsulation();
         cout << "Printing struct: name=" << s.name << ", value=" << s.value << endl;
         return true;
     }
@@ -98,6 +100,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::StructureSeq seq;
         in->read(seq);
+        in->endEncapsulation();
         cout << "Printing struct sequence: {";
         for(Demo::StructureSeq::iterator p = seq.begin(); p != seq.end(); ++p)
         {
@@ -114,7 +117,7 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
     {
         Demo::CPtr c;
         in->read(c);
-        in->readPendingObjects();
+        in->endEncapsulation();
         cout << "Printing class: s.name=" << c->s.name << ", s.value=" << c->s.value << endl;
         return true;
     }
@@ -124,9 +127,10 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
         c->s.name = "green";
         c->s.value = Demo::green;
         Ice::OutputStreamPtr out = Ice::createOutputStream(communicator);
+        out->startEncapsulation();
         out->write(c);
         out->write("hello");
-        out->writePendingObjects();
+        out->endEncapsulation();
         out->finished(outParams);
         return true;
     }
@@ -136,7 +140,9 @@ PrinterI::ice_invoke(const vector<Ice::Byte>& inParams, vector<Ice::Byte>& outPa
         Demo::PrintFailure ex;
         ex.reason = "paper tray empty";
         Ice::OutputStreamPtr out = Ice::createOutputStream(communicator);
+        out->startEncapsulation();
         out->write(ex);
+        out->endEncapsulation();
         out->finished(outParams);
         return false;
     }