1 files changed, 6 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index fd172f89e1d..592b10354b4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -28,13 +28,10 @@ TAO_CEC_ProxyPullConsumer::
 
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
 TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 {
-  this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_consumer_lock (this->lock_);
 }
 
@@ -113,24 +110,24 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   }
 
   CORBA::Any_var any;
-  TAO_CEC_SupplierControl *control =
-                 this->event_channel_->supplier_control ();
-
   ACE_TRY
     {
       any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      // Inform the control that we got something from the supplier
-      control->successful_transmission(this);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
+      TAO_CEC_SupplierControl *control =
+        this->event_channel_->supplier_control ();
+
       control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      TAO_CEC_SupplierControl *control =
+        this->event_channel_->supplier_control ();
+
       control->system_exception (this,
                                  sysex
                                  ACE_ENV_ARG_PARAMETER);