craigmcc 01/09/03 09:29:14
Modified: digester/src/java/org/apache/commons/digester RulesBase.java
Log:
When RulesBase accepts a new rule, only set the namespace of the added
rule to an explicitly set value. Otherwise, accept whatever namespace
setting is already present in the rule.
Submitted by: Robert Burrell Donkin <[EMAIL PROTECTED]>
Revision Changes Path
1.4 +6 -5
jakarta-commons/digester/src/java/org/apache/commons/digester/RulesBase.java
Index: RulesBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/RulesBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RulesBase.java 2001/08/26 22:13:44 1.3
+++ RulesBase.java 2001/09/03 16:29:14 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/RulesBase.java,v
1.3 2001/08/26 22:13:44 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/26 22:13:44 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/RulesBase.java,v
1.4 2001/09/03 16:29:14 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/09/03 16:29:14 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/08/26 22:13:44 $
+ * @version $Revision: 1.4 $ $Date: 2001/09/03 16:29:14 $
*/
public class RulesBase implements Rules {
@@ -194,7 +194,8 @@
}
list.add(rule);
rules.add(rule);
- rule.setNamespaceURI(this.namespaceURI);
+ if (this.namespaceURI != null)
+ rule.setNamespaceURI(this.namespaceURI);
}