svn commit: r628239 - in /logging/log4cxx/trunk/src: main/cpp/class.cpp test/cpp/asyncappendertestcase.cpp

[carnold]

Author: carnold
Date: Fri Feb 15 21:00:09 2008
New Revision: 628239

URL: http://svn.apache.org/viewvc?rev=628239&view=rev
Log:
LOGCXX-77: Static builds broken

Modified:
    logging/log4cxx/trunk/src/main/cpp/class.cpp
    logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp

Modified: logging/log4cxx/trunk/src/main/cpp/class.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/class.cpp?rev=628239&r1=628238&r2=628239&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/class.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/class.cpp Fri Feb 15 21:00:09 2008
@@ -65,6 +65,8 @@
 
 #include <log4cxx/rollingfileappender.h>
 #include <log4cxx/dailyrollingfileappender.h>
+#include <log4cxx/xml/domconfigurator.h>
+#include <log4cxx/propertyconfigurator.h>
 #include <apr.h>
 
 
@@ -180,5 +182,7 @@
         log4cxx::rolling::ManualTriggeringPolicy::registerClass();
         log4cxx::rolling::FixedWindowRollingPolicy::registerClass();
         log4cxx::rolling::FilterBasedTriggeringPolicy::registerClass();
+        log4cxx::xml::DOMConfigurator::registerClass();
+        log4cxx::PropertyConfigurator::registerClass();
 }
 

Modified: logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=628239&r1=628238&r2=628239&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Fri Feb 15 
21:00:09 2008
@@ -244,10 +244,11 @@
         }
         async->close();
         const std::vector<spi::LoggingEventPtr>& events = 
blockableAppender->getVector();
+        LOGUNIT_ASSERT(events.size() > 0);
         LoggingEventPtr initialEvent = events[0];
         LoggingEventPtr discardEvent = events[events.size() - 1];
-      LOGUNIT_ASSERT(initialEvent->getMessage() == LOG4CXX_STR("Hello, 
World"));
-      LOGUNIT_ASSERT(discardEvent->getMessage().substr(0,10) == 
LOG4CXX_STR("Discarded "));
+        LOGUNIT_ASSERT(initialEvent->getMessage() == LOG4CXX_STR("Hello, 
World"));
+        LOGUNIT_ASSERT(discardEvent->getMessage().substr(0,10) == 
LOG4CXX_STR("Discarded "));
         
LOGUNIT_ASSERT_EQUAL(log4cxx::spi::LocationInfo::getLocationUnavailable().getClassName(),
 
             discardEvent->getLocationInformation().getClassName()); 
     }