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 sd...@apache.org on 2003/05/21 08:22:59 UTC
cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw OroRegExpEvaluator.java
sdeboy 2003/05/20 23:22:58
Modified: src/java/org/apache/log4j/chainsaw OroRegExpEvaluator.java
Log:
Preventing NPE generated in the ORO regexp evaluator class when trying to match on a pattern that was invalid.
Revision Changes Path
1.2 +1 -1 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/OroRegExpEvaluator.java
Index: OroRegExpEvaluator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/OroRegExpEvaluator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OroRegExpEvaluator.java 28 Apr 2003 05:44:32 -0000 1.1
+++ OroRegExpEvaluator.java 21 May 2003 06:22:58 -0000 1.2
@@ -78,7 +78,7 @@
* @see org.apache.log4j.chainsaw.ExpressionEvaluator#match(String)
*/
public boolean match(String input) {
- return matcher.matches(input, pattern);
+ return (pattern !=null && matcher.matches(input, pattern));
}
private void readObject(java.io.ObjectInputStream in)
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org