Ported fix for bug 574.

3 files changed, 16 insertions, 16 deletions

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 753070d6296..87d9abb29ed 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -3349,15 +3349,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    _out << nl << "return;";
 	}
 	_out << eb;
-	_out << nl << "catch(IceInternal.NonRepeatable ex__)";
+	_out << nl << "catch(IceInternal.LocalExceptionWrapper ex__)";
 	_out << sb;
 	if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating)
 	{
-	    _out << nl << "cnt__ = handleException__(ex__.get(), cnt__);";
+	    _out << nl << "cnt__ = handleExceptionWrapperRelaxed__(ex__, cnt__);";
 	}
 	else
 	{
-	    _out << nl << "rethrowException__(ex__.get());";
+	    _out << nl << "handleExceptionWrapper__(ex__);";
 	}
 	_out << eb;
 	_out << nl << "catch(Ice.LocalException ex__)";
@@ -4020,7 +4020,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 	_out << eb;
 	_out << nl << "catch(Ice.LocalException ex__)";
 	_out << sb;
-	_out << nl << "throw new IceInternal.NonRepeatable(ex__);";
+	_out << nl << "throw new IceInternal.LocalExceptionWrapper(ex__, false);";
 	_out << eb;
         _out << eb;
         _out << nl << "finally";
@@ -4125,7 +4125,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    _out << eb;
 	    _out << nl << "catch(Ice.LocalException ex__)";
 	    _out << sb;
-	    _out << nl << "throw new IceInternal.NonRepeatable(ex__);";
+	    _out << nl << "throw new IceInternal.LocalExceptionWrapper(ex__, false);";
 	    _out << eb;
 	    _out << nl << "finally";
 	    _out << sb;
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 648dd82c3b8..bbee749c47f 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -242,7 +242,7 @@ Slice::JavaVisitor::writeDelegateThrowsClause(const string& package, const Excep
     out.inc();
     out << nl << "throws ";
     out.useCurrentPosAsIndent();
-    out << "IceInternal.NonRepeatable";
+    out << "IceInternal.LocalExceptionWrapper";
 
     ExceptionList::const_iterator r;
     for(r = throws.begin(); r != throws.end(); ++r)
@@ -3090,15 +3090,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             out << nl << "return;";
         }
         out << eb;
-        out << nl << "catch(IceInternal.NonRepeatable __ex)";
+        out << nl << "catch(IceInternal.LocalExceptionWrapper __ex)";
         out << sb;
         if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating)
         {
-            out << nl << "__cnt = __handleException(__ex.get(), __cnt);";
+            out << nl << "__cnt = __handleExceptionWrapperRelaxed(__ex, __cnt);";
         }
         else
         {
-            out << nl << "__rethrowException(__ex.get());";
+            out << nl << "__handleExceptionWrapper(__ex);";
         }
         out << eb;
         out << nl << "catch(Ice.LocalException __ex)";
@@ -3893,7 +3893,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 	out << eb;
 	out << nl << "catch(Ice.LocalException __ex)";
 	out << sb;
-	out << nl << "throw new IceInternal.NonRepeatable(__ex);";
+	out << nl << "throw new IceInternal.LocalExceptionWrapper(__ex, false);";
 	out << eb;
         out << eb;
         out << nl << "finally";
@@ -4003,7 +4003,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
             out << eb;
             out << nl << "catch(Ice.LocalException __ex)";
             out << sb;
-            out << nl << "throw new IceInternal.NonRepeatable(__ex);";
+            out << nl << "throw new IceInternal.LocalExceptionWrapper(__ex, false);";
 	    out << eb;
 	    out << eb;
 	    out << nl << "finally";
diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp
index e9007cb2130..280cb8ab97d 100755
--- a/cpp/src/slice2vb/Gen.cpp
+++ b/cpp/src/slice2vb/Gen.cpp
@@ -3691,15 +3691,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    _out << nl << "Return";
 	}
 	_out.dec();
-	_out << nl << "Catch ex__ As IceInternal.NonRepeatable";
+	_out << nl << "Catch ex__ As IceInternal.LocalExceptionWrapper";
 	_out.inc();
 	if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating)
 	{
-	    _out << nl << "cnt__ = handleException__(ex__.get(), cnt__)";
+	    _out << nl << "cnt__ = handleExceptionWrapperRelaxed__(ex__, cnt__)";
 	}
 	else
 	{
-	    _out << nl << "rethrowException__(ex__.get())";
+	    _out << nl << "handleExceptionWrapper__(ex__)";
 	}
 	_out.dec();
 	_out << nl << "Catch ex__ As Ice.LocalException";
@@ -4464,7 +4464,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 	_out.dec();
 	_out << nl << "Catch ex__ As Ice.LocalException";
 	_out.inc();
-	_out << nl << "throw New IceInternal.NonRepeatable(ex__)";
+	_out << nl << "throw New IceInternal.LocalExceptionWrapper(ex__, false)";
 	_out.dec();
 	_out << nl << "End Try";
         _out.dec();
@@ -4583,7 +4583,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    _out.dec();
 	    _out << nl << "Catch ex__ As Ice.LocalException";
 	    _out.inc();
-	    _out << nl << "Throw New IceInternal.NonRepeatable(ex__)";
+	    _out << nl << "Throw New IceInternal.LocalExceptionWrapper(ex__, false)";
 	    _out.dec();
 	    _out << nl << "Finally";
 	    _out.inc();