1 files changed, 24 insertions, 7 deletions

diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index c4f9398c8a5..c1ab8aae4d7 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -102,11 +102,16 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     out << sb;
 
     //
-    // Constructor
+    // Constructors
     //
-    out << sp << nl << "public" << nl << name << "(Freeze.DB db)";
+    out << sp << nl << "public" << nl << name << "(Ice.Communicator communicator, String envName, String dbName, boolean createDb)";
     out << sb;
-    out << nl << "super(db);";
+    out << nl << "super(communicator, envName, dbName, createDb);";
+    out << eb;
+
+    out << sp << nl << "public" << nl << name << "(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, String dbName, boolean createDb)";
+    out << sb;
+    out << nl << "super(communicator, dbEnv, dbName, createDb);";
     out << eb;
 
     //
@@ -191,8 +196,8 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         //
         // encode
         //
-        out << sp << nl << "public byte[]" << nl << "encode" << keyValue
-            << "(Object o, Ice.Communicator communicator)";
+        out << sp << nl << "public static byte[]" << nl << "encode" << keyValue
+            << "Impl(Object o, Ice.Communicator communicator)";
         out << sb;
         out << nl << "assert(o instanceof " << typeS << ");";
         if(_binary)
@@ -234,11 +239,17 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         }
         out << eb;
 
+	out << sp << nl << "public byte[]" << nl << "encode" << keyValue
+            << "(Object o, Ice.Communicator communicator)";
+        out << sb;
+        out << nl << "return encode" << keyValue << "Impl(o, communicator);";
+	out << eb;
+
         //
         // decode
         //
-        out << sp << nl << "public Object" << nl << "decode" << keyValue
-            << "(byte[] b, Ice.Communicator communicator)";
+        out << sp << nl << "public static Object" << nl << "decode" << keyValue
+            << "Impl(byte[] b, Ice.Communicator communicator)";
         out << sb;
         if(_binary)
         {
@@ -385,6 +396,12 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
             out << eb;
         }
         out << eb;
+
+	out << sp << nl << "public Object" << nl << "decode" << keyValue
+            << "(byte[] b, Ice.Communicator communicator)";
+        out << sb;
+        out << nl << "return decode" << keyValue << "Impl(b, communicator);";
+	out << eb;
     }
 
     if(!_binary)