1 files changed, 13 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 7b10e3bd40b..37c29ecba36 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,20 +1,20 @@
 // $Id$
 
-#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "ConsumerAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_ConsumerAdmin,
            "$Id$")
 
-#include "orbsvcs/Notify/Subscription_Change_Worker.h"
-#include "orbsvcs/Notify/Proxy.h"
-#include "orbsvcs/Notify/EventChannel.h"
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Factory.h"
-#include "orbsvcs/Notify/Builder.h"
-#include "orbsvcs/Notify/Find_Worker_T.h"
-#include "orbsvcs/Notify/Seq_Worker_T.h"
-#include "orbsvcs/Notify/ProxySupplier.h"
+#include "Subscription_Change_Worker.h"
+#include "Proxy.h"
+#include "EventChannel.h"
+#include "Properties.h"
+#include "Factory.h"
+#include "Builder.h"
+#include "Find_Worker_T.h"
+#include "Seq_Worker_T.h"
+#include "ProxySupplier.h"
 
 #include "tao/debug.h"
 
@@ -27,8 +27,6 @@ ACE_RCSID (RT_Notify,
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -92,11 +90,11 @@ TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
+  ACE_CHECK;
+
   this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -325,10 +323,8 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
     this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
   }
   this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 CosNotifyFilter::FilterID
@@ -484,5 +480,3 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier (
   }
   return result;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL