1 files changed, 5 insertions, 7 deletions
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 3ee40ec6b0b..52b21000087 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -34,7 +34,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr poa,
                                 const char * /* operation */,
                                 PortableServer::ServantLocator::Cookie &cookie,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   // Convert ObjectID to String.
 
@@ -55,12 +55,10 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
     }
   else
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //
-      //CORBA::Exception *exception =
-      //  new CORBA::OBJECT_NOT_EXIST ();
-      //env.exception (exception);
-      //return 0;
+      CORBA::Exception *exception =
+        new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
     }
 }