diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-23 05:09:29 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-23 05:09:29 +0000 |
| commit | 04c63e5a5c3a23160d3e23d55d8fd11fd643e60a (patch) | |
| tree | a070a040fd67561eeec75ab5c31b9f298acffd5c /TAO/orbsvcs/orbsvcs | |
| parent | bb79724b6e005d9a8bd71098ba8fa64c7e52da91 (diff) | |
| download | ATCD-04c63e5a5c3a23160d3e23d55d8fd11fd643e60a.tar.gz | |
ChangeLogTag: Sun May 22 22:10:00 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 3ed1588812c..a2f18c466fe 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Log, Log_i, "$Id$") -#define QUERY_LANG_SUPPORTED_BY_LOG "TCL" +#define QUERY_LANG_SUPPORTED_BY_LOG "EXTENDED_TCL" TAO_Log_i::TAO_Log_i (DsLogAdmin::LogMgr_ptr factory, DsLogAdmin::LogId id, @@ -822,7 +822,7 @@ TAO_Log_i::delete_records (const char *grammar, this->match_i (constraint, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - if (count > 0) + if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -862,7 +862,7 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids } } - if (count > 0) + if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1160,8 +1160,7 @@ TAO_Log_i::check_grammar (const char* grammar ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)) { - // Verify that the grammar is "TCL". - // The spec. asks for "extended TCL" + // Verify that the grammar is "EXTENDED_TCL". if (ACE_OS::strcmp (grammar, QUERY_LANG_SUPPORTED_BY_LOG) != 0) ACE_THROW (DsLogAdmin::InvalidGrammar ()); } @@ -1303,7 +1302,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) } } - if (count > 0) + if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); |