3 files changed, 1 insertions, 26 deletions
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index bb6545d3508..e90cfe8cd31 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -50,13 +50,6 @@ 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);
-
       if (notify_service.init (argc, argv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("Failed to initialize the Notification Service.\n")),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 4d94655a12e..68c4d5928fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -14,8 +14,6 @@ ACE_RCSID (Notify,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-static TAO_Notify_Properties* properties = 0;
-
 TAO_Notify_Properties::TAO_Notify_Properties (void)
   : factory_ (0)
   , builder_ (0)
@@ -45,21 +43,8 @@ TAO_Notify_Properties::~TAO_Notify_Properties ()
 TAO_Notify_Properties *
 TAO_Notify_Properties::instance (void)
 {
-  if (properties == 0)
-    {
-      // Hide the template instantiation to prevent multiple instances
-      // from being created.
-      properties = TAO_Singleton<TAO_Notify_Properties,
+  return ACE_Unmanaged_Singleton<TAO_Notify_Properties,
                                  TAO_SYNCH_MUTEX>::instance ();
-    }
-
-  return properties;
-}
-
-void
-TAO_Notify_Properties::instance (TAO_Notify_Properties* props)
-{
-  properties = props;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 2a33e0d4a2d..98e38df5705 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -49,9 +49,6 @@ public:
   /// Return a singleton instance of this class.
   static TAO_Notify_Properties * instance (void);
 
-  /// Set the singleton instance for this class.
-  static void instance (TAO_Notify_Properties* properties);
-
   // = Property Accessors
   TAO_Notify_Factory* factory (void);
   void factory (TAO_Notify_Factory* factory);