Make generated code more Ice like

1 files changed, 18 insertions, 1 deletions

diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index 36a91cd5009..ff8dcfcd2a0 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -2175,13 +2175,30 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
         {
             out << "return ";
         }
-        out << opName << spar << args << "__defaultContext()" << epar << ';';
+        out << opName << spar << args << "null, false" << epar << ';';
         out << eb;
 
         out << sp;
         out << nl << "public " << retS << nl << opName << spar << params << "java.util.Hashtable __ctx" << epar;
         writeThrowsClause(package, throws);
         out << sb;
+        out << nl;
+        if(ret)
+        {
+            out << "return ";
+        }
+        out << opName << spar << args << "__ctx, true" << epar << ';';
+        out << eb;
+
+        out << sp;
+        out << nl << "public " << retS << nl << opName << spar << params 
+            << "java.util.Hashtable __ctx, boolean __explicitCtx" << epar;
+        writeThrowsClause(package, throws);
+        out << sb;
+        out << nl << "if(__explicitCtx && __ctx == null)";
+        out << sb;
+        out << nl << "__ctx = _emptyContext;";
+        out << eb;
         out << nl << "int __cnt = 0;";
         out << nl << "while(true)";
         out << sb;