carnold 2005/08/19 12:30:30
Modified: src/java/org/apache/log4j Tag: v1_2-branch FileAppender.java
src/java/org/apache/log4j/spi Tag: v1_2-branch
LoggerRepository.java
Log:
Bug 9150: Check for null return from getParent when creating dir
Revision Changes Path
No revision
No revision
1.34.2.5 +9 -4 logging-log4j/src/java/org/apache/log4j/FileAppender.java
Index: FileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/FileAppender.java,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -u -r1.34.2.4 -r1.34.2.5
--- FileAppender.java 22 Jul 2005 18:58:44 -0000 1.34.2.4
+++ FileAppender.java 19 Aug 2005 19:30:30 -0000 1.34.2.5
@@ -293,11 +293,16 @@
// attempt to create it and try to create file
// see bug 9150
//
- File parentDir = new File(new File(fileName).getParent());
- if(!parentDir.exists() && parentDir.mkdirs()) {
- ostream = new FileOutputStream(fileName, append);
+ String parentName = new File(fileName).getParent();
+ if (parentName != null) {
+ File parentDir = new File(parentName);
+ if(!parentDir.exists() && parentDir.mkdirs()) {
+ ostream = new FileOutputStream(fileName, append);
+ } else {
+ throw ex;
+ }
} else {
- throw ex;
+ throw ex;
}
}
Writer fw = createWriter(ostream);
No revision
No revision
1.9.2.3 +1 -1
logging-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java
Index: LoggerRepository.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- LoggerRepository.java 24 May 2005 05:06:21 -0000 1.9.2.2
+++ LoggerRepository.java 19 Aug 2005 19:30:30 -0000 1.9.2.3
@@ -89,7 +89,7 @@
Enumeration getCurrentLoggers();
/**
- @deprecated Please use [EMAIL PROTECTED] #getCurrentLoggers} instead.
*/
+ Deprecated. Please use [EMAIL PROTECTED] #getCurrentLoggers} instead.
*/
public
Enumeration getCurrentCategories();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
