cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap SelectNode.java
Date Wed, 27 Mar 2002 22:20:13 GMT
sylvain     02/03/27 14:20:12

  Modified:    src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        SelectNode.java
  Log:
  Fix NPE reported by Martin Holz (holz@fiz-chemie.de)
  
  Revision  Changes    Path
  1.2       +4 -7      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java
  
  Index: SelectNode.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SelectNode.java	5 Mar 2002 08:26:23 -0000	1.1
  +++ SelectNode.java	27 Mar 2002 22:20:12 -0000	1.2
  @@ -77,7 +77,7 @@
   /**
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Id: SelectNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
  + * @version CVS $Id: SelectNode.java,v 1.2 2002/03/27 22:20:12 sylvain Exp $
    */
   
   public class SelectNode extends SimpleSelectorProcessingNode
  @@ -86,9 +86,6 @@
       /** The parameters of this node */
       private Map parameters;
   
  -    /** Selector where to get Actions from */
  -    protected ComponentSelector componentSelector;
  -
       /** Pre-selected selector, if it's ThreadSafe */
       protected Selector threadSafeSelector;
   
  @@ -147,7 +144,7 @@
               return false;
   
           } else {
  -            Selector selector = (Selector)this.componentSelector.select(this.componentName);
  +            Selector selector = (Selector)this.selector.select(this.componentName);
               try {
   
                   for (int i = 0; i < this.whenTests.length; i++) {
  @@ -165,14 +162,14 @@
   
                   return false;
               } finally {
  -                this.componentSelector.release(selector);
  +                this.selector.release(selector);
               }
           }
       }
   
       public void dispose() {
           if (this.threadSafeSelector != null) {
  -            this.componentSelector.release(this.threadSafeSelector);
  +            this.selector.release(this.threadSafeSelector);
           }
       }
   }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message