Thu Mar 4 13:02:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h:
        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp:
        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h:
        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp:
        * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp:

          Improved reporting of error conditions. 
        

6 files changed, 32 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a041d321999..01dcd325838 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Mar  4 13:02:04 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h:
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp:
+        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h:
+        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp:
+        * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp:
+
+          Improved reporting of error conditions. 
+        
 Thu Mar  4 12:57:52 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tools/Convert_Plan/Convert_Plan.cpp:
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
index 7d090ea568c..da1836889c9 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
@@ -9,7 +9,8 @@ namespace CIAO_Simple_SimpleConsumer_Impl
   // Component Executor Implementation Class:   SimpleConsumer_exec_i
   //==================================================================
 
-  SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)
+  SimpleConsumer_exec_i::SimpleConsumer_exec_i (void) :
+    pushed_ (false)
   {
     DANCE_TRACE ("SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)");
   }
@@ -31,7 +32,8 @@ namespace CIAO_Simple_SimpleConsumer_Impl
   {
     DANCE_TRACE ("SimpleConsumer_exec_i::push_hello_ ()");
     // Your code here.
-
+    
+    this->pushed_ = true;
     ACE_DEBUG ((LM_EMERGENCY, "SimpleConsumer_exec_i::push_hello_ - "
                  "Received hello event, value is %s\n", ev->hello_ ()));
   }
@@ -78,6 +80,10 @@ namespace CIAO_Simple_SimpleConsumer_Impl
   SimpleConsumer_exec_i::ccm_remove ()
   {
     DANCE_TRACE ("SimpleConsumer_exec_i::ccm_remove ()");
+    if (!pushed_)
+      {
+        ACE_ERROR ((LM_EMERGENCY, "Error: SimpleConsumer didn't get pushed!\n"));
+      }
     // Your code here.
   }
 
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
index 2069c87dbbb..d2b0e816302 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
@@ -50,6 +50,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl
 
     private:
     ::Simple::CCM_SimpleConsumer_Context_var context_;
+    bool pushed_;
   };
 
   class SIMPLECONSUMER_EXEC_Export SimpleConsumerHome_exec_i
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
index f42c735a559..0cd1ffe396b 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
@@ -9,7 +9,8 @@ namespace CIAO_Simple_SimpleProvider_Impl
   // Facet Executor Implementation Class:   Trigger_exec_i
   //==================================================================
 
-  Trigger_exec_i::Trigger_exec_i (void)
+  Trigger_exec_i::Trigger_exec_i (bool &triggered)
+    : triggered_ (triggered)
   {
     DANCE_TRACE ("Trigger_exec_i::Trigger_exec_i (void)");
   }
@@ -26,6 +27,7 @@ namespace CIAO_Simple_SimpleProvider_Impl
     const char * hello )
   {
     DANCE_TRACE ("Trigger_exec_i::hello ()");
+    this->triggered_ = true;
     // Your code here.
     ACE_DEBUG ((LM_EMERGENCY, "Trigger_exec_i::hello - "
                  "Got the following information from trig port: %C\n",
@@ -37,6 +39,7 @@ namespace CIAO_Simple_SimpleProvider_Impl
   //==================================================================
 
   SimpleProvider_exec_i::SimpleProvider_exec_i (void)
+    : triggered_ (false)
   {
     DANCE_TRACE ("SimpleProvider_exec_i::SimpleProvider_exec_i (void)");
   }
@@ -56,7 +59,7 @@ namespace CIAO_Simple_SimpleProvider_Impl
   SimpleProvider_exec_i::get_trig ()
   {
     DANCE_TRACE ("SimpleProvider_exec_i::get_trig ()");
-    return new Trigger_exec_i ();
+    return new Trigger_exec_i (this->triggered_);
   }
 
   // Operations from Components::SessionComponent
@@ -100,6 +103,9 @@ namespace CIAO_Simple_SimpleProvider_Impl
   SimpleProvider_exec_i::ccm_remove ()
   {
     DANCE_TRACE ("SimpleProvider_exec_i::ccm_remove ()");
+    if (!triggered_)
+      ACE_ERROR ((LM_EMERGENCY, "Error:  My facet wasn't triggered!!\n"));
+    
     // Your code here.
   }
 
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
index a0dda3db076..1ffa389790f 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
@@ -21,7 +21,7 @@ namespace CIAO_Simple_SimpleProvider_Impl
       public virtual ::CORBA::LocalObject
   {
     public:
-    Trigger_exec_i (void);
+    Trigger_exec_i (bool &);
     virtual ~Trigger_exec_i (void);
 
     // Operations from ::Simple::Trigger
@@ -29,6 +29,9 @@ namespace CIAO_Simple_SimpleProvider_Impl
     virtual void
     hello (
       const char * hello);
+    
+  private:
+    bool &triggered_;
   };
 
   class SIMPLEPROVIDER_EXEC_Export SimpleProvider_exec_i
@@ -64,6 +67,7 @@ namespace CIAO_Simple_SimpleProvider_Impl
 
     private:
     ::Simple::CCM_SimpleProvider_Context_var context_;
+    bool triggered_;
   };
 
   class SIMPLEPROVIDER_EXEC_Export SimpleProviderHome_exec_i
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
index a0e83b17707..9bbc600dd4a 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
@@ -53,7 +53,6 @@ namespace CIAO_Simple_SimplePublisher_Impl
   {
     DANCE_TRACE ("SimplePublisher_exec_i::ccm_activate ()");
     ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimplePublisher_exec_i");
-
     this->context_->push_hello (hello._retn ());
     // Your code here.
   }