demo fixes

5 files changed, 62 insertions, 17 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;
     }
diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index 7c49dd1aeaa..41d4d7f8d81 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -86,7 +86,9 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     out.writeString("The streaming API works!");
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -104,8 +106,10 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     final String[] arr = { "The", "streaming", "API", "works!" };
                     Demo.StringSeqHelper.write(out, arr);
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -123,10 +127,12 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     java.util.Map<String, String> dict = new java.util.HashMap<String, String>();
                     dict.put("The", "streaming");
                     dict.put("API", "works!");
                     Demo.StringDictHelper.write(out, dict);
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -144,7 +150,9 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     Demo.Color.green.ice_write(out);
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -162,10 +170,12 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     Demo.Structure s = new Demo.Structure();
                     s.name = "red";
                     s.value = Demo.Color.red;
                     s.ice_write(out);
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -183,6 +193,7 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     Demo.Structure[] arr = new Demo.Structure[3];
                     arr[0] = new Demo.Structure();
                     arr[0].name = "red";
@@ -194,6 +205,7 @@ public class Client extends Ice.Application
                     arr[2].name = "blue";
                     arr[2].value = Demo.Color.blue;
                     Demo.StructureSeqHelper.write(out, arr);
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -211,12 +223,13 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
+                    out.startEncapsulation();
                     Demo.C c = new Demo.C();
                     c.s = new Demo.Structure();
                     c.s.name = "blue";
                     c.s.value = Demo.Color.blue;
                     Demo.CHelper.write(out, c);
-                    out.writePendingObjects();
+                    out.endEncapsulation();
 
                     //
                     // Invoke operation.
@@ -244,10 +257,11 @@ public class Client extends Ice.Application
                     // Unmarshal the results.
                     //
                     Ice.InputStream in = Ice.Util.createInputStream(communicator(), outParams.value);
+                    in.startEncapsulation();
                     Demo.CHolder c = new Demo.CHolder();
                     Demo.CHelper.read(in, c);
                     String str = in.readString();
-                    in.readPendingObjects();
+                    in.endEncapsulation();
                     in.destroy();
                     System.out.println("Got string `" + str + "' and class: s.name=" + c.value.s.name +
                         ", s.value=" + c.value.s.value);
@@ -265,6 +279,7 @@ public class Client extends Ice.Application
                     }
 
                     Ice.InputStream in = Ice.Util.createInputStream(communicator(), outParams.value);
+                    in.startEncapsulation();
                     try
                     {
                         in.throwException();
@@ -277,6 +292,7 @@ public class Client extends Ice.Application
                     {
                         System.out.println("Unknown user exception");
                     }
+                    in.endEncapsulation();
                     in.destroy();
                 }
                 else if(line.equals("s"))
diff --git a/java/demo/Ice/invoke/PrinterI.java b/java/demo/Ice/invoke/PrinterI.java
index 9f4c6760817..ed637578466 100644
--- a/java/demo/Ice/invoke/PrinterI.java
+++ b/java/demo/Ice/invoke/PrinterI.java
@@ -14,22 +14,21 @@ public class PrinterI extends Ice.Blobject
     {
         Ice.Communicator communicator = current.adapter.getCommunicator();
 
-        Ice.InputStream in = null;
-        if(inParams.length > 0)
-        {
-            in = Ice.Util.createInputStream(communicator, inParams);
-        }
+        Ice.InputStream in = Ice.Util.createInputStream(communicator, inParams);
+        in.startEncapsulation();
 
         if(current.operation.equals("printString"))
         {
             String message = in.readString();
             System.out.println("Printing string `" + message + "'");
+            in.endEncapsulation();
             in.destroy();
             return true;
         }
         else if(current.operation.equals("printStringSequence"))
         {
             String[] seq = Demo.StringSeqHelper.read(in);
+            in.endEncapsulation();
             in.destroy();
             System.out.print("Printing string sequence {");
             for(int i = 0; i < seq.length; ++i)
@@ -46,6 +45,7 @@ public class PrinterI extends Ice.Blobject
         else if(current.operation.equals("printDictionary"))
         {
             java.util.Map<String, String> dict = Demo.StringDictHelper.read(in);
+            in.endEncapsulation();
             in.destroy();
             System.out.print("Printing dictionary {");
             boolean first = true;
@@ -64,6 +64,7 @@ public class PrinterI extends Ice.Blobject
         else if(current.operation.equals("printEnum"))
         {
             Demo.Color c = Demo.Color.ice_read(in);
+            in.endEncapsulation();
             in.destroy();
             System.out.println("Printing enum " + c);
             return true;
@@ -72,6 +73,7 @@ public class PrinterI extends Ice.Blobject
         {
             Demo.Structure s = new Demo.Structure();
             s.ice_read(in);
+            in.endEncapsulation();
             in.destroy();
             System.out.println("Printing struct: name=" + s.name + ", value=" + s.value);
             return true;
@@ -79,6 +81,7 @@ public class PrinterI extends Ice.Blobject
         else if(current.operation.equals("printStructSequence"))
         {
             Demo.Structure[] seq = Demo.StructureSeqHelper.read(in);
+            in.endEncapsulation();
             in.destroy();
             System.out.print("Printing struct sequence: {");
             for(int i = 0; i < seq.length; ++i)
@@ -96,7 +99,7 @@ public class PrinterI extends Ice.Blobject
         {
             Demo.CHolder c = new Demo.CHolder();
             Demo.CHelper.read(in, c);
-            in.readPendingObjects();
+            in.endEncapsulation();
             in.destroy();
             System.out.println("Printing class: s.name=" + c.value.s.name + ", s.value=" + c.value.s.value);
             return true;
@@ -108,9 +111,11 @@ public class PrinterI extends Ice.Blobject
             c.s.name = "green";
             c.s.value = Demo.Color.green;
             Ice.OutputStream out = Ice.Util.createOutputStream(communicator);
+            out.startEncapsulation();
             Demo.CHelper.write(out, c);
             out.writeString("hello");
             out.writePendingObjects();
+            out.endEncapsulation();
             outParams.value = out.finished();
             return true;
         }
@@ -120,7 +125,9 @@ public class PrinterI extends Ice.Blobject
             Demo.PrintFailure ex = new Demo.PrintFailure();
             ex.reason = "paper tray empty";
             Ice.OutputStream out = Ice.Util.createOutputStream(communicator);
+            out.startEncapsulation();
             out.writeException(ex);
+            out.endEncapsulation();
             outParams.value = out.finished();
             return false;
         }
diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice
index b14bd8a6e89..259a8733e5b 100644
--- a/java/demo/Ice/value/Value.ice
+++ b/java/demo/Ice/value/Value.ice
@@ -38,7 +38,7 @@ interface Initial
 {
     Simple getSimple();
     void getPrinter(out Printer impl, out Printer* proxy);
-    Printer getDerivedPrinter();
+    ["format:sliced"] Printer getDerivedPrinter();
     void throwDerivedPrinter() throws DerivedPrinterException;
     void shutdown();
 };