*** empty log message ***

3 files changed, 9 insertions, 41 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index be618793360..3b564912b81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -23,36 +23,6 @@ TAO_NS_RT_Builder::~TAO_NS_RT_Builder ()
 {
 }
 
-CosNotifyFilter::FilterFactory_ptr
-TAO_NS_RT_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
-{
-  return TAO_NS_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  TAO_NS_FilterFactory* ff = ACE_Dynamic_Service<TAO_NS_FilterFactory>::instance ("TAO_NS_FilterFactory");
-
-  if (ff == 0)
-    {
-      ACE_NEW_THROW_EX (ff,
-                        TAO_NS_ETCL_FilterFactory (),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
-    }
-
-  PortableServer::POA_var default_poa = TAO_NS_PROPERTIES::instance ()->default_poa ();
-
-  TAO_NS_RT_POA_Helper filter_poa;
-
-  NotifyExt::ThreadPoolParams tp_params = {0, 1, 0, 0, 0, 0, 0 };
-
-  //filter_poa.init (default_poa.in (), tp_params ACE_ENV_ARG_PARAMETER);
-  filter_poa.init (default_poa.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::POA_var filter_poa_var = filter_poa.poa ();
-
-  return ff->create (filter_poa_var ACE_ENV_ARG_PARAMETER);
-}
-
 void
 TAO_NS_RT_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object
                                                        , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
@@ -63,7 +33,7 @@ TAO_NS_RT_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object
   ACE_NEW_THROW_EX (proxy_poa,
                     TAO_NS_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  ACE_CHECK;
 
   auto_ptr<TAO_NS_POA_Helper> auto_proxy_poa (proxy_poa);
 
@@ -89,7 +59,7 @@ TAO_NS_RT_Builder::apply_lane_concurrency (TAO_NS_Object& object
   ACE_NEW_THROW_EX (proxy_poa,
                     TAO_NS_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  ACE_CHECK;
 
   auto_ptr<TAO_NS_POA_Helper> auto_proxy_poa (proxy_poa);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 89591289e0a..ca8beb37ad6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -36,9 +36,6 @@ public:
   /// Destructor
   virtual ~TAO_NS_RT_Builder ();
 
-  /// Build the Filter Factory.
-  virtual CosNotifyFilter::FilterFactory_ptr build_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
-
   /// Apply Thread Pools.
   virtual void apply_thread_pool_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 448ac8a612d..8e54cac09bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -8,6 +8,7 @@
 
 ACE_RCSID(RT_Notify, TAO_NS_RT_Notify_Service, "$Id$")
 
+#include "ace/Dynamic_Service.h"
 #include "Properties.h"
 #include "RT_Properties.h"
 #include "RT_Factory.h"
@@ -43,23 +44,23 @@ TAO_NS_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   CORBA::Object_var object =
     orb->resolve_initial_references ("RTORB"
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK;
 
   RTCORBA::RTORB_var rt_orb =
     RTCORBA::RTORB::_narrow (object.in ()
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK;
 
   // Resolve RTCurrent
   object =
     orb->resolve_initial_references ("RTCurrent"
                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK;
 
   RTCORBA::Current_var current =
     RTCORBA::Current::_narrow (object.in ()
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK;
 
  /// Set the properties
   properties->rt_orb (rt_orb.in ());
@@ -74,8 +75,8 @@ TAO_NS_RT_Notify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
   if (this->factory_ == 0)
     {
       ACE_NEW_THROW_EX (this->factory_,
-			TAO_NS_RT_Factory (),
-			CORBA::NO_MEMORY ());
+                        TAO_NS_RT_Factory (),
+                        CORBA::NO_MEMORY ());
       ACE_CHECK;
     }