Thu Jul 5 06:22:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 1 insertions, 10 deletions

diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index aa652e311fe..e90cfe8cd31 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -50,16 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-      // Set the properties instance before initializing the notify
-      // service.  Using the static singleton can cause static
-      // destruction issues between the properties instance and
-      // statically allocated type code structures.
-      TAO_Notify_Properties properties;
-      TAO_Notify_Properties::instance (&properties);
-
-      int result = notify_service.init (argc, argv);
-
-       if (result == -1)
+      if (notify_service.init (argc, argv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("Failed to initialize the Notification Service.\n")),
                           1);