[Carob-commits] CVS update of carob/src (Common.cpp)

[marc]

    Date: Thursday, May 3, 2007 @ 19:27:47
  Author: marc
    Path: /cvsroot/carob/carob/src

Modified: Common.cpp (1.70 -> 1.71)

Replaced isGreaterOrEqual(logger->getLevel()) by appropriate isXXXEnabled().
logger->getLevel() can return a null value (documented). Should fix LMS-39 
segfault.


------------+
 Common.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.70 carob/src/Common.cpp:1.71
--- carob/src/Common.cpp:1.70   Fri Mar 16 12:40:14 2007
+++ carob/src/Common.cpp        Thu May  3 19:27:47 2007
@@ -167,7 +167,7 @@
 bool CarobNS::isDebugEnabled()
 {
 #ifdef CAROB_LOG4CXX_NAME
-  return log4cxx::Level::DEBUG->isGreaterOrEqual(logger->getLevel());
+  return logger->isDebugEnabled();
 #else
   return currentLogLevel <= LOG_LEVEL_DEBUG;
 #endif
@@ -175,7 +175,7 @@
 bool CarobNS::isInfoEnabled()
 {
 #ifdef CAROB_LOG4CXX_NAME
-  return log4cxx::Level::INFO->isGreaterOrEqual(logger->getLevel());
+  return logger->isInfoEnabled();
 #else
   return currentLogLevel <= LOG_LEVEL_INFO;
 #endif
@@ -183,7 +183,7 @@
 bool CarobNS::isWarnEnabled()
 {
 #ifdef CAROB_LOG4CXX_NAME
-  return log4cxx::Level::WARN->isGreaterOrEqual(logger->getLevel());
+  return logger->isWarnEnabled();
 #else
   return currentLogLevel <= LOG_LEVEL_WARN;
 #endif
@@ -191,7 +191,7 @@
 bool CarobNS::isErrorEnabled()
 {
 #ifdef CAROB_LOG4CXX_NAME
-  return log4cxx::Level::ERROR->isGreaterOrEqual(logger->getLevel());
+  return logger->isErrorEnabled();
 #else
   return currentLogLevel <= LOG_LEVEL_ERROR;
 #endif
@@ -199,7 +199,7 @@
 bool CarobNS::isFatalEnabled()
 {
 #ifdef CAROB_LOG4CXX_NAME
-  return log4cxx::Level::FATAL->isGreaterOrEqual(logger->getLevel());
+  return logger->isFatalEnabled();
 #else
   return currentLogLevel <= LOG_LEVEL_FATAL;
 #endif

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits