You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ni...@apache.org on 2006/12/06 09:50:24 UTC

svn commit: r482970 - in /jakarta/commons/proper/validator/trunk: project.xml src/share/org/apache/commons/validator/ValidatorResources.java

Author: niallp
Date: Wed Dec  6 00:50:22 2006
New Revision: 482970

URL: http://svn.apache.org/viewvc?view=rev&rev=482970
Log:
VALIDATOR-211 Upgrade to Digester 1.8

Modified:
    jakarta/commons/proper/validator/trunk/project.xml
    jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java

Modified: jakarta/commons/proper/validator/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/project.xml?view=diff&rev=482970&r1=482969&r2=482970
==============================================================================
--- jakarta/commons/proper/validator/trunk/project.xml (original)
+++ jakarta/commons/proper/validator/trunk/project.xml Wed Dec  6 00:50:22 2006
@@ -247,7 +247,7 @@
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.6</version>
+      <version>1.8</version>
       <url>http://jakarta.apache.org/commons/digester/</url>
       <properties>
           <comment>

Modified: jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java?view=diff&rev=482970&r1=482969&r2=482970
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java (original)
+++ jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java Wed Dec  6 00:50:22 2006
@@ -233,22 +233,7 @@
         Digester digester = initDigester();
         for (int i = 0; i < urls.length; i++) {
             digester.push(this);
-            InputStream stream = null;
-            try {
-                stream = urls[i].openStream();
-                org.xml.sax.InputSource source = 
-                     new org.xml.sax.InputSource(urls[i].toExternalForm());
-                source.setByteStream(stream);
-                digester.parse(source);
-            } finally {
-                if (stream != null) {
-                    try {
-                        stream.close();
-                    } catch (IOException e) {
-                        // ignore problem closing
-                    }
-                }
-            } 
+            digester.parse(urls[i]);
         }
 
         this.process();



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