moving Outgoing cache from proxies to connections

1 files changed, 7 insertions, 7 deletions

diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index fe86758f6be..78869753fac 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -2928,15 +2928,15 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
         writeDelegateThrowsClause(package, throws);
         out << sb;
 
-        out << nl << "IceInternal.Outgoing __out = getOutgoing(\"" << op->name() << "\", " << sliceModeToIceMode(op)
-	    << ", __ctx);";
+        out << nl << "IceInternal.Outgoing __og = __connection.getOutgoing(__reference, \"" << op->name() << "\", "
+	    << sliceModeToIceMode(op) << ", __ctx);";
         out << nl << "try";
         out << sb;
         if(!inParams.empty())
         {
 	    out << nl << "try";
 	    out << sb;
-            out << nl << "IceInternal.BasicStream __os = __out.os();";
+            out << nl << "IceInternal.BasicStream __os = __og.os();";
 	    iter = 0;
 	    for(pli = inParams.begin(); pli != inParams.end(); ++pli)
 	    {
@@ -2946,13 +2946,13 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    out << eb;
 	    out << nl << "catch(Ice.LocalException __ex)";
 	    out << sb;
-	    out << nl << "__out.abort(__ex);";
+	    out << nl << "__og.abort(__ex);";
 	    out << eb;
 	}
-	out << nl << "boolean __ok = __out.invoke();";
+	out << nl << "boolean __ok = __og.invoke();";
 	out << nl << "try";
 	out << sb;
-	out << nl << "IceInternal.BasicStream __is = __out.is();";
+	out << nl << "IceInternal.BasicStream __is = __og.is();";
         out << nl << "if(!__ok)";
         out << sb;
 	out << nl << "try";
@@ -2993,7 +2993,7 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
         out << eb;
         out << nl << "finally";
         out << sb;
-        out << nl << "reclaimOutgoing(__out);";
+        out << nl << "__connection.reclaimOutgoing(__og);";
         out << eb;
         out << eb;
     }