1 files changed, 14 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 71ff8590b4c..9affc97ebdd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
-#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "SupplierAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin,
            "$Id$")
 
-#include "orbsvcs/Notify/Builder.h"
-#include "orbsvcs/Notify/ProxyConsumer.h"
-#include "orbsvcs/Notify/EventChannel.h"
-#include "orbsvcs/Notify/Subscription_Change_Worker.h"
-#include "orbsvcs/Notify/Find_Worker_T.h"
-#include "orbsvcs/Notify/Seq_Worker_T.h"
-#include "orbsvcs/Notify/Properties.h"
+#include "Builder.h"
+#include "ProxyConsumer.h"
+#include "EventChannel.h"
+#include "Subscription_Change_Worker.h"
+#include "Find_Worker_T.h"
+#include "Seq_Worker_T.h"
+#include "Properties.h"
 
 #include "tao/debug.h"
 
@@ -23,12 +23,10 @@ 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::ProxyConsumer
-                                 , CosNotifyChannelAdmin::ProxyConsumer_ptr
-                                 , CosNotifyChannelAdmin::ProxyNotFound>
+                             , CosNotifyChannelAdmin::ProxyConsumer
+                             , CosNotifyChannelAdmin::ProxyConsumer_ptr
+                             , CosNotifyChannelAdmin::ProxyNotFound>
 TAO_Notify_ProxyConsumer_Find_Worker;
 
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
@@ -85,11 +83,11 @@ TAO_Notify_SupplierAdmin::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;
 }
@@ -426,5 +424,3 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer (
   }
   return result;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL