craigmcc 01/08/15 13:35:43
Modified: digester/src/java/org/apache/commons/digester
SetPropertiesRule.java SetPropertyRule.java
Log:
Make property name matching work correctly when namespace processing is
off. The earlier fix only helped on elements.
Submitted by: Robert Burrell Donkin <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +9 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java
Index: SetPropertiesRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetPropertiesRule.java 2001/05/12 17:25:54 1.2
+++ SetPropertiesRule.java 2001/08/15 20:35:43 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.2 2001/05/12 17:25:54 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2001/05/12 17:25:54 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.3 2001/08/15 20:35:43 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/08/15 20:35:43 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* stack, based on attributes with corresponding names.
*
* @author Craig McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/05/12 17:25:54 $
+ * @version $Revision: 1.3 $ $Date: 2001/08/15 20:35:43 $
*/
public class SetPropertiesRule extends Rule {
@@ -109,7 +109,12 @@
HashMap values = new HashMap();
for (int i = 0; i < attributes.getLength(); i++) {
String name = attributes.getLocalName(i);
+ if ("".equals(name))
+ name = attributes.getQName(i);
String value = attributes.getValue(i);
+ if (digester.getDebug() >= 9)
+ digester.log(" Setting property '" + name + "' to '" +
+ value + "'");
values.put(name, value);
}
1.3 +6 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java
Index: SetPropertyRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetPropertyRule.java 2001/05/12 17:25:54 1.2
+++ SetPropertyRule.java 2001/08/15 20:35:43 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.2 2001/05/12 17:25:54 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2001/05/12 17:25:54 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.3 2001/08/15 20:35:43 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/08/15 20:35:43 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* top of the stack, based on attributes with specified names.
*
* @author Craig McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/05/12 17:25:54 $
+ * @version $Revision: 1.3 $ $Date: 2001/08/15 20:35:43 $
*/
public class SetPropertyRule extends Rule {
@@ -133,6 +133,8 @@
HashMap values = new HashMap();
for (int i = 0; i < attributes.getLength(); i++) {
String name = attributes.getLocalName(i);
+ if ("".equals(name))
+ name = attributes.getQName(i);
String value = attributes.getValue(i);
if (name.equals(this.name))
actualName = value;
