diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-18 15:25:33 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-18 15:25:33 -0230 |
| commit | 3d0919c51141f5a9a14dcac35feb0c7527cf96f6 (patch) | |
| tree | f440888d1ea29cfe319812a357afedba6464088d /cpp/src/slice2cs/Gen.cpp | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2239 - protocol/encoding v... (diff) | |
| download | ice-3d0919c51141f5a9a14dcac35feb0c7527cf96f6.tar.bz2 ice-3d0919c51141f5a9a14dcac35feb0c7527cf96f6.tar.xz ice-3d0919c51141f5a9a14dcac35feb0c7527cf96f6.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2260 - invalid generated async proxy code
Diffstat (limited to 'cpp/src/slice2cs/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 341d2d52489..93b926534e1 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -3501,12 +3501,20 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << sp; _out << nl << "public void " << opName << "_async" << spar << paramsAMI << epar; _out << sb; - _out << nl << "cb__.invoke__" << spar << "this" << argsAMI << "null" << epar << ';'; + _out << nl << opName << "_async" << spar << argsAMI << "null" << "false" << epar << ';'; _out << eb; + _out << sp; _out << nl << "public void " << opName << "_async" << spar << paramsAMI << "Ice.Context ctx__" << epar; _out << sb; - _out << nl << "if(ctx__ == null)"; + _out << nl << opName << "_async" << spar << argsAMI << "ctx__" << "true" << epar << ';'; + _out << eb; + + _out << sp; + _out << nl << "public void " << opName << "_async" << spar << paramsAMI << "Ice.Context ctx__" + << "bool explicitContext__" << epar; + _out << sb; + _out << nl << "if(explicitContext__ && ctx__ == null)"; _out << sb; _out << nl << "ctx__ = emptyContext_;"; _out << eb; |