diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-02-23 04:04:55 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-02-23 04:04:55 +0000 |
| commit | a6621dee2d6760af8c18ddf1d7105fa9b333353f (patch) | |
| tree | 944b31bab6c61fab766a509ae24575f91f550fa4 | |
| parent | eba3995b6fcdc9984089c62cb8f8bf98d5711153 (diff) | |
| download | ATCD-a6621dee2d6760af8c18ddf1d7105fa9b333353f.tar.gz | |
Tue Feb 23 04:03:46 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp | 22 |
2 files changed, 24 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2ce1537872d..2ce47acc876 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,9 +1,10 @@ -Tue Feb 23 03:02:27 UTC 2010 Abdul Sowayan <sowayan@gmail.com> +Tue Feb 23 04:03:46 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> - * bin/ciao_tests.lst: - - Added the test scripts below to the daily regression tests. + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + Additional error checking, and an improvements to how + colocation groups with NoConstraint are handled. + Tue Feb 23 02:55:31 UTC 2010 Abdul Sowayan <sowayan@gmail.com> * examples/Hello/descriptors/NodeMap.dat: diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index dce4d995ad4..9b1bdabd753 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -1126,7 +1126,14 @@ NodeApplication_Impl::create_colocation_groups (void) for (CORBA::ULong i = 0; i < this->plan_.localityConstraint.length (); ++i) { - if (this->plan_.localityConstraint[i].constraint != ::Deployment::PlanSameProcess) + if (this->plan_.localityConstraint[i].constraint == ::Deployment::PlanNoConstraint) + { + DANCE_DEBUG (10, (LM_INFO, DLINFO + ACE_TEXT ("NodeApplication_Impl::create_colocation_groups - ") + ACE_TEXT ("Skipping NoConstraint Colocation group\n"))); + continue; + } + else if (this->plan_.localityConstraint[i].constraint != ::Deployment::PlanSameProcess) { DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("NodeApplication_Impl::create_colocation_groups - ") @@ -1134,7 +1141,7 @@ NodeApplication_Impl::create_colocation_groups (void) i)); continue; } - + ::CORBA::ULongSeq const &instances = this->plan_.localityConstraint[i].constrainedInstanceRef; @@ -2043,13 +2050,22 @@ NodeApplication_Impl::connect_receptacle (const ::Deployment::PlanConnectionDesc { DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - ") ACE_TEXT("connect SimplexReceptacle for [%C] started\n"), recep_name.c_str())); + if (CORBA::is_nil (facet)) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("NodeApplication_Impl::connect_receptacle - ") + "Object reference for facet to connect to [%C] was nil\n", + recep_name.c_str ())); + throw ::Deployment::InvalidConnection ("", + "Provided facet reference was nil\n"); + } + res = facet->connect (recep_name.c_str(), receptacle); DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - connect finished\n"))); } } catch (const ::Components::InvalidName& ) { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_Impl::connect_receptacle - ") + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - ") ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n"))); throw ::Deployment::StartError("", "Received InvalidName exception while connecting receptacle."); |