diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-02 23:00:17 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-02 23:00:17 +0000 |
| commit | d0ec6305a24d4a3437d484672a7d29def0a04957 (patch) | |
| tree | 13cff23e7800a60c8aa3d772d26182f6f1fc3e09 | |
| parent | f9027fcdef532b3dda937016958c856823e4c2f0 (diff) | |
| download | ATCD-d0ec6305a24d4a3437d484672a7d29def0a04957.tar.gz | |
Mon Nov 2 22:59:48 UTC 2009 Yan Dai <dai_y@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/MC/notify.conf | 5 |
4 files changed, 19 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f2b19270cb..7f1b6869753 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Mon Nov 2 22:59:48 UTC 2009 Yan Dai <dai_y@ociweb.com> + + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + + Made MonitorManager not start ORBTask if MC is not required. + This should resolve Notify tests failure on static builds. + + * orbsvcs/tests/Notify/MC/notify.conf: + + Removed this file as it'll be generated when running the test + and cause setup warning on scoreboard. + Mon Nov 2 16:54:24 UTC 2009 Steven Stallion <stallions@ociweb.com> * tests/RTCORBA/Bug_3643_Regression/test_i.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index 5f349c82353..b9f4bd3d89e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -18,6 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_MonitorManager::TAO_MonitorManager (void) : run_ (false) + , initialized_ (false) { } @@ -85,6 +86,9 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) // Force the ARGV_T to copy the elements added by the add() method this->task_.argv_.argv (); + + // Rember that Monitor has been configured + this->initialized_ = true; return 0; } @@ -121,7 +125,7 @@ TAO_MonitorManager::run (void) task_.argv_.argv (), task_.mc_orb_name_.c_str ()); - if (!this->run_) + if (!this->run_ && this->initialized_) { this->run_ = true; activate = true; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h index d1e6696553b..60e58d1b9c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h @@ -58,6 +58,7 @@ private: }; bool run_; + bool initialized_; ORBTask task_; }; diff --git a/TAO/orbsvcs/tests/Notify/MC/notify.conf b/TAO/orbsvcs/tests/Notify/MC/notify.conf deleted file mode 100644 index f0b80a96227..00000000000 --- a/TAO/orbsvcs/tests/Notify/MC/notify.conf +++ /dev/null @@ -1,5 +0,0 @@ -## $Id$ - -dynamic TAO_MC_Notify_Service Service_Object * TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service () "" -static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1" -dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-o monitor.ior -ORBArg -ORBInitRef -ORBArg NameService=corbaloc:iiop:localhost:12083/NameService" |