fixes

1 files changed, 12 insertions, 51 deletions

diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index 78c415a85c9..c01cd66b7fa 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -14,9 +14,6 @@
 ThrowerI::ThrowerI(const Ice::ObjectAdapterPtr& adapter) :
     _adapter(adapter)
 {
-    _a = APrx::uncheckedCast(_adapter->addTemporary(new A));
-    _b = BPrx::uncheckedCast(_adapter->addTemporary(new B));
-    _c = CPrx::uncheckedCast(_adapter->addTemporary(new C));
 }
 
 void
@@ -28,15 +25,9 @@ ThrowerI::shutdown()
 void
 ThrowerI::throwAasA(Ice::Int a)
 {
-    APtr p = new A;
-    p->a = a;
-    p->_throw();
-}
-
-void
-ThrowerI::throwAasAproxy()
-{
-    _a->_throw();
+    A ex;
+    ex.a = a;
+    throw ex;
 }
 
 void
@@ -46,36 +37,18 @@ ThrowerI::throwBasA(Ice::Int a, Ice::Int b)
 }
 
 void
-ThrowerI::throwBasAproxy()
-{
-    throwBasBproxy();
-}
-
-void
 ThrowerI::throwCasA(Ice::Int a, Ice::Int b, Ice::Int c)
 {
     throwCasC(a, b, c);
 }
 
 void
-ThrowerI::throwCasAproxy()
-{
-    throwCasCproxy();
-}
-
-void
 ThrowerI::throwBasB(Ice::Int a, Ice::Int b)
 {
-    BPtr p = new B;
-    p->a = a;
-    p->b = b;
-    p->_throw();
-}
-
-void
-ThrowerI::throwBasBproxy()
-{
-    _b->_throw();
+    B ex;
+    ex.a = a;
+    ex.b = b;
+    throw ex;
 }
 
 void
@@ -85,23 +58,11 @@ ThrowerI::throwCasB(Ice::Int a, Ice::Int b, Ice::Int c)
 }
 
 void
-ThrowerI::throwCasBproxy()
-{
-    throwCasCproxy();
-}
-
-void
 ThrowerI::throwCasC(Ice::Int a, Ice::Int b, Ice::Int c)
 {
-    CPtr p = new C;
-    p->a = a;
-    p->b = b;
-    p->c = c;
-    p->_throw();
-}
-
-void
-ThrowerI::throwCasCproxy()
-{
-    _c->_throw();
+    C ex;
+    ex.a = a;
+    ex.b = b;
+    ex.c = c;
+    throw ex;
 }