You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/12/23 11:53:50 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/pattern DatePatternConverter.java
ceki 2004/12/23 02:53:50
Modified: src/java/org/apache/log4j/pattern DatePatternConverter.java
Log:
Fixed silly NullPointerException bug.
Revision Changes Path
1.11 +9 -3 logging-log4j/src/java/org/apache/log4j/pattern/DatePatternConverter.java
Index: DatePatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/DatePatternConverter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DatePatternConverter.java 22 Dec 2004 21:56:35 -0000 1.10
+++ DatePatternConverter.java 23 Dec 2004 10:53:49 -0000 1.11
@@ -59,11 +59,17 @@
* or any date and time pattern accepted by java.text.SimpleDateFormat.
*/
public void setOptions(List optionList) {
+
+ String patternOption;
+
if(optionList == null || optionList.size() == 0) {
- return;
+ // the branch could be optimized, but here we are making explicit
+ // that null values for patternOption are allowed.
+ patternOption = null;
+ } else {
+ patternOption = (String) optionList.get(0);
}
- String patternOption = (String) optionList.get(0);
String pattern;
if (patternOption == null) {
pattern = "yyyy-MM-dd HH:mm:ss,SSS";
@@ -91,7 +97,7 @@
}
// if the option list contains a TZ option, then set it.
- if (optionList.size() > 1) {
+ if (optionList != null && optionList.size() > 1) {
TimeZone tz = TimeZone.getTimeZone((String) optionList.get(1));
df.setTimeZone(tz);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org