1 files changed, 10 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index be2f9f74299..c87728df2ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
+#include "SequenceProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "SequencePushConsumer.h"
+#include "../Properties.h"
 
 TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
 {
@@ -21,6 +19,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier ()
 void
 TAO_Notify_SequenceProxyPushSupplier::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -80,20 +79,17 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior))
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
     {
-      CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil();
-      if (ior.length() > 0)
-      {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::SequencePushConsumer_var pc =
+        CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
       this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -104,5 +100,3 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
     ACE_ENDTRY;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL