ilene 2002/09/25 07:21:49
Modified: java/src/org/apache/xalan/templates ElemAttribute.java
Log:
Patch for bugzilla #4344.
Revision Changes Path
1.20 +21 -19
xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java
Index: ElemAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemAttribute.java 23 Sep 2002 19:51:55 -0000 1.19
+++ ElemAttribute.java 25 Sep 2002 14:21:49 -0000 1.20
@@ -124,25 +124,27 @@
// If they are trying to add an attribute when there isn't an
// element pending, it is an error.
- if (!rhandler.isElementPending())
- {
- // Make sure the trace event is sent.
- if (TransformerImpl.S_DEBUG)
- transformer.getTraceManager().fireTraceEvent(this);
-
- XPathContext xctxt = transformer.getXPathContext();
- int sourceNode = xctxt.getCurrentNode();
- String attrName = m_name_avt.evaluate(xctxt, sourceNode, this);
- transformer.getMsgMgr().warn(this,
-
XSLTErrorResources.WG_ILLEGAL_ATTRIBUTE_POSITION,
- new Object[]{ attrName });
-
- if (TransformerImpl.S_DEBUG)
- transformer.getTraceManager().fireTraceEndEvent(this);
- return;
-
- // warn(templateChild, sourceNode, "Trying to add attribute after
element child has been added, ignoring...");
- }
+ // I don't think we need this check here because it is checked in
+ // ResultTreeHandler.addAttribute. (is)
+// if (!rhandler.isElementPending())
+// {
+// // Make sure the trace event is sent.
+// if (TransformerImpl.S_DEBUG)
+// transformer.getTraceManager().fireTraceEvent(this);
+//
+// XPathContext xctxt = transformer.getXPathContext();
+// int sourceNode = xctxt.getCurrentNode();
+// String attrName = m_name_avt.evaluate(xctxt, sourceNode, this);
+// transformer.getMsgMgr().warn(this,
+//
XSLTErrorResources.WG_ILLEGAL_ATTRIBUTE_POSITION,
+// new Object[]{ attrName });
+//
+// if (TransformerImpl.S_DEBUG)
+// transformer.getTraceManager().fireTraceEndEvent(this);
+// return;
+//
+// // warn(templateChild, sourceNode, "Trying to add attribute after
element child has been added, ignoring...");
+// }
super.execute(transformer);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
