From eb73c227aa998bc9111238551f4fd6d1e4e09681 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Fri, 17 Aug 2007 14:39:27 +0000 Subject: Fri Aug 17 14:38:15 UTC 2007 Phil Mesnier --- TAO/tao/ORB.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'TAO/tao/ORB.cpp') diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 370ae906eef..df76fb3cdb5 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1220,10 +1220,12 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid) ACE_TEXT("-ORBGestalt"), orbconfig_string)) { + const ACE_TCHAR *arg = ACE_TEXT_CHAR_TO_TCHAR(orbconfig_string.c_str ()); + const ACE_TCHAR *local = ACE_TEXT("LOCAL"); + const ACE_TCHAR *shared = ACE_TEXT("ORB:"); // Need a local repo? Make one which typically should not be as // big as the default repository - if (ACE_OS::strcasecmp (orbconfig_string.c_str (), - ACE_TEXT("LOCAL")) == 0) + if (ACE_OS::strcasecmp (arg,local) == 0) { ACE_NEW_THROW_EX (gestalt, ACE_Service_Gestalt @@ -1234,8 +1236,7 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid) CORBA::COMPLETED_NO)); guard_gestalt.reset(gestalt); } - else if (ACE_OS::strncmp (orbconfig_string.c_str (), - ACE_TEXT ("ORB:"), 4) == 0) + else if (ACE_OS::strncmp (arg, shared, sizeof (shared) - 1) == 0) { // @TODO: At some point, we need to implement a lookup of an // existing configuration context based on the orbid -- cgit v1.2.1