summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-05-23 11:59:44 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-05-23 11:59:44 +0200
commitd81701ca8182942b7936f9fd84a019b695e9c890 (patch)
treedc036c9d701fbbe1afad67782bd78572c0f61974 /cpp/src/slice2java
parentFixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff)
downloadice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2
ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz
ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'cpp/src/slice2java')
-rw-r--r--cpp/src/slice2java/Gen.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index af6ab51f233..1f75a15f44a 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -4944,7 +4944,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << "catch(Ice.TwowayOnlyException ex)";
out << sb;
out << nl << "__r = new IceInternal.OutgoingAsync(this, __" << op->name() << "_name, __cb);";
- out << nl << "__r.__exceptionAsync(ex);";
+ out << nl << "__r.__invokeExceptionAsync(ex);";
out << eb;
}
else
@@ -4971,7 +4971,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << "catch(Ice.TwowayOnlyException ex)";
out << sb;
out << nl << "__r = new IceInternal.OutgoingAsync(this, __" << op->name() << "_name, __cb);";
- out << nl << "__r.__exceptionAsync(ex);";
+ out << nl << "__r.__invokeExceptionAsync(ex);";
out << eb;
}
else
@@ -5873,11 +5873,11 @@ Slice::Gen::HelperVisitor::writeOperation(const ClassDefPtr& p, const string& pa
{
out << nl << "__result.__writeEmptyParams();";
}
- out << nl << "__result.__send(true);";
+ out << nl << "__result.__invoke(true);";
out << eb;
out << nl << "catch(Ice.LocalException __ex)";
out << sb;
- out << nl << "__result.__exceptionAsync(__ex);";
+ out << nl << "__result.__invokeExceptionAsync(__ex);";
out << eb;
out << nl << "return __result;";
out << eb;