You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by cr...@apache.org on 2003/09/30 18:20:55 UTC

cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules DigesterRuleParser.java

craigmcc    2003/09/30 09:20:55

  Modified:    digester/src/java/org/apache/commons/digester/xmlrules
                        DigesterRuleParser.java
  Log:
  Correct class loader lookup when loading resources in includeXMLRules()
  to use the Thread context class loader (if it exists), or the class loader
  that loaded DigesterRuleParser otherwise.  Fixed in nightly build
  20031001.
  
  Patch Submitted By:  Esteban Lorenzano (estebanlm at yahoo.com)
  
  Revision  Changes    Path
  1.17      +5 -1      jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java
  
  Index: DigesterRuleParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DigesterRuleParser.java	16 Aug 2003 18:18:26 -0000	1.16
  +++ DigesterRuleParser.java	30 Sep 2003 16:20:55 -0000	1.17
  @@ -362,7 +362,11 @@
            */
           private void includeXMLRules(String fileName)
                           throws IOException, SAXException, CircularIncludeException {
  -            URL fileURL = DigesterRuleParser.this.getClass().getClassLoader().getResource(fileName);
  +            ClassLoader cl = Thread.currentThread().getContextClassLoader();
  +            if (cl == null) {
  +                cl = DigesterRuleParser.this.getClass().getClassLoader();
  +            }
  +            URL fileURL = cl.getResource(fileName);
               if (fileURL == null) {
                   throw new FileNotFoundException("File \"" + fileName + "\" not found.");
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org