1 files changed, 9 insertions, 4 deletions
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index 21c1227fbf3..244c46764e4 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -10,14 +10,19 @@ int server_main (int argc,
                  Test::Server_Request_Interceptor *cri);
 
 int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
+test_transport_current (CORBA::ORB_ptr orb)  ACE_THROW_SPEC ((CORBA::SystemException,
                                                             CORBA::UserException));
 
 int
 ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
-  Test::Server_Request_Interceptor cri ("test_orb", test_transport_current);
-  return server_main (argc, argv, &cri);
+  Test::Server_Request_Interceptor* cri = 0;
+  ACE_NEW_RETURN (cri,
+                  Test::Server_Request_Interceptor ("test_orb",
+                                                    test_transport_current),
+                  -1);
+  PortableInterceptor::ServerRequestInterceptor_var cri_safe (cri);
+
+  return server_main (argc, argv, cri);
 }