FIXED bug #771051: don't load local DTDs if they aren't available

diff --git a/src/share/org/securityfilter/config/SecurityConfig.java b/src/share/org/securityfilter/config/SecurityConfig.java
index ea9dfe0..1141717 100644 (file)
--- a/src/share/org/securityfilter/config/SecurityConfig.java
+++ b/src/share/org/securityfilter/config/SecurityConfig.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConfig.java,v 1.11 2003/10/25 08:09:39 maxcooper Exp $
- * $Revision: 1.11 $
- * $Date: 2003/10/25 08:09:39 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/config/SecurityConfig.java,v 1.12 2003/10/25 11:45:24 maxcooper Exp $
+ * $Revision: 1.12 $
+ * $Date: 2003/10/25 11:45:24 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -73,7 +73,7 @@ import java.util.List;
  * @author Torgeir Veimo (torgeir@pobox.com)
  * @author Max Cooper (max@maxcooper.com)
  * @author Daya Sharma (iamdaya@yahoo.com, billydaya@sbcglobal.net)
- * @version $Revision: 1.11 $ $Date: 2003/10/25 08:09:39 $
+ * @version $Revision: 1.12 $ $Date: 2003/10/25 11:45:24 $
  */
 public class SecurityConfig {
 
@@ -249,9 +249,7 @@ public class SecurityConfig {
       Digester digester = new Digester();
 
       // only register the DTDs if we will be validating
-      if (validating) {
-         registerLocalDTDs(digester);
-      }
+      registerLocalDTDs(digester);
 
       digester.push(this);
       digester.setValidating(validating);
@@ -330,17 +328,17 @@ public class SecurityConfig {
     * @param digester
     */
    protected void registerLocalDTDs(Digester digester) {
-      // register the local version of the 1.0 DTD
-      digester.register(
-         "-//SecurityFilter.org//DTD Security Filter Configuration 1.0//EN",
-         this.getClass().getResource("/org/securityfilter/resources/securityfilter-config_1_0.dtd").toString()
-      );
+      // register the local version of the 1.0 DTD, if it is available
+      URL dtd1_0 = this.getClass().getResource("/org/securityfilter/resources/securityfilter-config_1_0.dtd");
+      if (dtd1_0 != null) {
+         digester.register("-//SecurityFilter.org//DTD Security Filter Configuration 1.0//EN", dtd1_0.toString());
+      }
 
-      // register the local version of the 1.1 DTD
-      digester.register(
-         "-//SecurityFilter.org//DTD Security Filter Configuration 1.1//EN",
-         this.getClass().getResource("/org/securityfilter/resources/securityfilter-config_1_1.dtd").toString()
-      );
+      // register the local version of the 1.1 DTD, if it is available
+      URL dtd1_1 = this.getClass().getResource("/org/securityfilter/resources/securityfilter-config_1_1.dtd");
+      if (dtd1_1 != null) {
+         digester.register("-//SecurityFilter.org//DTD Security Filter Configuration 1.1//EN", dtd1_1.toString());
+      }
    }
 }