diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-30 20:44:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-30 20:44:11 +0000 |
| commit | 1699e6ea7ea5c12e5371b0703d35a354e7e08d4e (patch) | |
| tree | 7b3a48632dd1e481ef10c81332fed4006930e247 | |
| parent | b4846e81d61715293360ae6d4ba29f1114cf1b16 (diff) | |
| download | ATCD-1699e6ea7ea5c12e5371b0703d35a354e7e08d4e.tar.gz | |
Tue Jan 30 20:43:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp | 26 |
2 files changed, 28 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 8282ac25cde..ccc8da191e2 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jan 30 20:43:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: + Changed the check for the bind, with -1 return an error, with + 1 report a debug message of the reuse, else a normal debug. + Thanks to Sandro Andrade <sandro dot andrade at gmail dot com> + for reporting that ReDAC was broken. + Tue Jan 30 11:27:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Server_init.{h,cpp}: diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp index 83775494498..a0df1e2cac8 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp @@ -55,7 +55,9 @@ CIAO::Deployment_Configuration::init (const char *filename) ACE_CString destination (string, dest_end - string); // And then the IOR ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1)); - if (this->deployment_info_.bind (destination.c_str (), ior.c_str ()) != 0) + int const result = + this->deployment_info_.bind (destination.c_str (), ior.c_str ()); + if (result == -1) { ACE_ERROR_RETURN ((LM_ERROR, "DAnCE (%P|%t) Deployment_Configuration, " @@ -63,12 +65,24 @@ CIAO::Deployment_Configuration::init (const char *filename) destination.c_str ()), -1); } - - if (CIAO::debug_level () > 5) + else if (result == 1) { - ACE_DEBUG ((LM_DEBUG, - "DAnCE (%P|%t) Deployment_Configuration, " - "read <%s> <%s>\n", destination.c_str (), ior.c_str ())); + if (CIAO::debug_level () > 5) + { + ACE_DEBUG ((LM_DEBUG, + "DAnCE (%P|%t) Deployment_Configuration.cpp, " + "reuse existing node in the cached map: <%s>\n" , + destination.c_str ())); + } + } + else + { + if (CIAO::debug_level () > 5) + { + ACE_DEBUG ((LM_DEBUG, + "DAnCE (%P|%t) Deployment_Configuration, " + "bind <%s> <%s>\n", destination.c_str (), ior.c_str ())); + } } if (first) |