diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-28 03:15:00 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-28 03:15:00 +0000 |
| commit | d8cf30e26113f4580da8aa602e2638f3f6942139 (patch) | |
| tree | c86964eea73ec9feac57f5024c6a41f3e17af3df | |
| parent | bada64c61e3d761da703d182d987131a7145308d (diff) | |
| download | ATCD-d8cf30e26113f4580da8aa602e2638f3f6942139.tar.gz | |
ChangeLogTag: Fri May 27 20:14:56 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8a6efdc5eef..022c539ad34 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri May 27 20:14:56 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Log/Log_i.cpp (check_grammar): + + Changed to accept TCL, ETCL, and EXTENDED_TCL like the + Notification Service. + Fri May 27 15:19:57 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Log/Log_i.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 44336e3f720..8db0f6d32a8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -14,8 +14,6 @@ ACE_RCSID (Log, Log_i, "$Id$") -#define QUERY_LANG_SUPPORTED_BY_LOG "EXTENDED_TCL" - TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, DsLogAdmin::LogMgr_ptr factory, DsLogAdmin::LogId id, @@ -1198,8 +1196,10 @@ TAO_Log_i::check_grammar (const char* grammar ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)) { - // Verify that the grammar is "EXTENDED_TCL". - if (ACE_OS::strcmp (grammar, QUERY_LANG_SUPPORTED_BY_LOG) != 0) + // Verify grammar + if (ACE_OS::strcmp (grammar, "TCL") != 0 && + ACE_OS::strcmp (grammar, "ETCL") != 0 && + ACE_OS::strcmp (grammar, "EXTENDED_TCL") != 0) ACE_THROW (DsLogAdmin::InvalidGrammar ()); } |