diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-19 13:44:35 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-19 13:44:35 -0500 |
| commit | f5d572b6ef4c382b86b760392732877e8e47f23e (patch) | |
| tree | c3e0094e78984129e25ea201bfae893a5d8cbd10 /cpp/src/slice2java/Gen.cpp | |
| parent | Merge branch 'master' of bernard@cvs.zeroc.com:/home/git/ice (diff) | |
| download | ice-f5d572b6ef4c382b86b760392732877e8e47f23e.tar.bz2 ice-f5d572b6ef4c382b86b760392732877e8e47f23e.tar.xz ice-f5d572b6ef4c382b86b760392732877e8e47f23e.zip | |
Fixed bug #2514
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index e49e502d8f7..d802e9388b0 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3600,10 +3600,17 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << name << "Prx __d = null;"; out << nl << "if(__obj != null)"; out << sb; + out << nl << "try"; + out << sb; + out << nl << "__d = (" << name << "Prx)__obj;"; + out << eb; + out << nl << "catch(ClassCastException ex)"; + out << sb; out << nl << name << "PrxHelper __h = new " << name << "PrxHelper();"; out << nl << "__h.__copyFrom(__obj);"; out << nl << "__d = __h;"; out << eb; + out << eb; out << nl << "return __d;"; out << eb; |