cvs commit: cocoon-2.1/src/java/org/apache/cocoon/selection ExceptionSelector.java JXPathExceptionSelector.java

[cziegeler]

cziegeler    2003/07/30 01:21:25

  Modified:    src/java/org/apache/cocoon/selection ExceptionSelector.java
  Removed:     src/java/org/apache/cocoon/selection
                        JXPathExceptionSelector.java
  Log:
  Removing obsolete JXPathExceptioSelector
  Fixing NPE in ExceptionSelector
  
  Revision  Changes    Path
  1.6       +4 -1      
cocoon-2.1/src/java/org/apache/cocoon/selection/ExceptionSelector.java
  
  Index: ExceptionSelector.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/selection/ExceptionSelector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExceptionSelector.java    10 Jul 2003 13:16:55 -0000      1.5
  +++ ExceptionSelector.java    30 Jul 2003 08:21:25 -0000      1.6
  @@ -181,6 +181,9 @@
       }
   
       public boolean select(String expression, Object selectorContext) {
  +        if ( selectorContext == null ) {
  +            return false;
  +        }
           // Just compare the expression with the previously found name
                boolean result = 
expression.equals(((FindResult)selectorContext).getName());