cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap SwitchSelectNode.java

[cziegeler]

cziegeler    2003/07/29 01:46:00

  Modified:    src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        SwitchSelectNode.java
  Log:
  Reverting changes
  
  Revision  Changes    Path
  1.3       +1 -8      
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java
  
  Index: SwitchSelectNode.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SwitchSelectNode.java     29 Jul 2003 06:28:54 -0000      1.2
  +++ SwitchSelectNode.java     29 Jul 2003 08:46:00 -0000      1.3
  @@ -128,9 +128,6 @@
           if (this.threadSafeSelector != null) {
   
               Object ctx = 
this.threadSafeSelector.getSelectorContext(objectModel, resolvedParams);
  -            if ( ctx == null ) {
  -                return false;
  -            }
   
               for (int i = 0; i < this.whenTests.length; i++) {
                   if 
(this.threadSafeSelector.select(whenTests[i].resolve(context, objectModel), 
ctx)) {
  @@ -150,10 +147,6 @@
               Object ctx = selector.getSelectorContext(objectModel, 
resolvedParams);
              
               try {
  -                if ( ctx == null ) {
  -                    return false;
  -                }
  -                
                   for (int i = 0; i < this.whenTests.length; i++) {
                       if (selector.select(whenTests[i].resolve(context, 
objectModel), ctx)) {
                           return invokeNodes(this.whenNodes[i], env, context);