Mon Feb 12 18:57:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 30 insertions, 36 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 45467d61e82..e3a38dcd463 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -100,7 +100,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership)
       persistent_poa_.in ());
 
 
-    TAO_FTEC_Event_Channel_Impl* ec;
+    TAO_FTEC_Event_Channel_Impl* ec = 0;
     ACE_NEW_THROW_EX (ec,
       TAO_FTEC_Event_Channel_Impl (attr),
       CORBA::NO_MEMORY());
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index d38754f62a2..59da9c56d46 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -78,36 +78,34 @@ public:
 
   /// EventChannelFacade Interface, used by FTEC gateway
 
-      virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
-        RtecEventComm::PushConsumer_ptr push_consumer,
-        const RtecEventChannelAdmin::ConsumerQOS & qos);
+  virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
+    RtecEventComm::PushConsumer_ptr push_consumer,
+    const RtecEventChannelAdmin::ConsumerQOS & qos);
 
+  virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
+      RtecEventComm::PushSupplier_ptr push_supplier,
+      const RtecEventChannelAdmin::SupplierQOS & qos);
 
-    virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
-        RtecEventComm::PushSupplier_ptr push_supplier,
-        const RtecEventChannelAdmin::SupplierQOS & qos);
+  virtual void disconnect_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void disconnect_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid);
+  virtual void disconnect_push_consumer (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void disconnect_push_consumer (
-        const FtRtecEventChannelAdmin::ObjectId & oid);
+  virtual void suspend_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void suspend_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid);
+  virtual void resume_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void resume_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid);
-
-    virtual void push (
-        const FtRtecEventChannelAdmin::ObjectId & oid,
-        const RtecEventComm::EventSet & data);
+  virtual void push (
+      const FtRtecEventChannelAdmin::ObjectId & oid,
+      const RtecEventComm::EventSet & data);
 
   /// FTRT::GroupManager Interfaces
   /// These are used for inter-replica communications
 
-  void set_state (
-    const FTRT::State & s);
+  void set_state (const FTRT::State & s);
 
   virtual void set_update (const FTRT::State & s);
 
@@ -118,25 +116,21 @@ public:
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out cur);
 
-    virtual void create_group (
-        const FTRT::ManagerInfoList & info_list,
-        CORBA::ULong object_group_ref_version);
-
-    virtual void join_group (
-        const FTRT::ManagerInfo & info
-      )ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void create_group (
+      const FTRT::ManagerInfoList & info_list,
+      CORBA::ULong object_group_ref_version);
 
-    virtual void add_member (
-        const FTRT::ManagerInfo & info,
-        CORBA::ULong object_group_ref_version);
+  virtual void join_group (const FTRT::ManagerInfo & info);
 
-    virtual void remove_member (
-        const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version);
+  virtual void add_member (
+      const FTRT::ManagerInfo & info,
+      CORBA::ULong object_group_ref_version);
 
-    virtual void replica_crashed (
-        const FTRT::Location & location);
+  virtual void remove_member (
+      const FTRT::Location & crashed_location,
+      CORBA::ULong object_group_ref_version);
 
+  virtual void replica_crashed (const FTRT::Location & location);
 
 private:
   CORBA::ORB_var orb_;