diff --strip-trailing-cr -r -x build -u ./include/log4cxx/writerappender.h ../latest-hw/include/log4cxx/writerappender.h --- ./include/log4cxx/writerappender.h 2006-11-09 15:39:05.837599300 +0100 +++ ../latest-hw/include/log4cxx/writerappender.h 2006-11-09 10:57:42.960799500 +0100 @@ -144,7 +144,7 @@ /** * Close the underlying {@link java.io.Writer}. * */ - void closeWriter(); + void closeWriter(log4cxx::helpers::Pool& p); /** Returns an OutputStreamWriter when passed an OutputStream. The diff --strip-trailing-cr -r -x build -u ./src/fileappender.cpp ../latest-hw/src/fileappender.cpp --- ./src/fileappender.cpp 2006-11-09 15:39:05.837599300 +0100 +++ ../latest-hw/src/fileappender.cpp 2006-11-09 10:57:42.898301100 +0100 @@ -214,7 +214,7 @@ setImmediateFlush(false); } - closeWriter(); + closeWriter(p); bool writeBOM = false; if(StringHelper::equalsIgnoreCase(getEncoding(), diff --strip-trailing-cr -r -x build -u ./src/rollingfileappender.cpp ../latest-hw/src/rollingfileappender.cpp --- ./src/rollingfileappender.cpp 2006-11-09 15:39:05.853183500 +0100 +++ ../latest-hw/src/rollingfileappender.cpp 2006-11-09 10:57:42.929550300 +0100 @@ -148,7 +148,7 @@ if (rollover1 != NULL) { if (rollover1->getActiveFileName() == getFile()) { - closeWriter(); + closeWriter(p); bool success = true; @@ -185,7 +185,7 @@ OutputStreamPtr os(new FileOutputStream( rollover1->getActiveFileName(), rollover1->getAppend())); WriterPtr newWriter(createWriter(os)); - closeWriter(); + closeWriter(p); setFile(rollover1->getActiveFileName()); setWriter(newWriter); diff --strip-trailing-cr -r -x build -u ./src/writerappender.cpp ../latest-hw/src/writerappender.cpp --- ./src/writerappender.cpp 2006-11-09 15:39:05.853183500 +0100 +++ ../latest-hw/src/writerappender.cpp 2006-11-09 10:57:42.851427300 +0100 @@ -134,17 +134,17 @@ } closed = true; - closeWriter(); + Pool p; + closeWriter(p); } /** * Close the underlying {@link java.io.Writer}. * */ -void WriterAppender::closeWriter() { +void WriterAppender::closeWriter(Pool& p) { if (writer != NULL) { try { // before closing we have to output out layout's footer - Pool p; writeFooter(p); writer->close(p); writer = 0;