neeraj 2003/04/03 02:58:49
Modified: java/src/org/apache/xerces/impl
XML11DocumentScannerImpl.java
XMLDTDScannerImpl.java
XMLDocumentFragmentScannerImpl.java
XMLNSDocumentScannerImpl.java XMLScanner.java
java/src/org/apache/xerces/impl/msg XMLMessages.properties
Log:
Fix for bug 17294. Thanks to Venugopal for the patch.
Revision Changes Path
1.5 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
Index: XML11DocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XML11DocumentScannerImpl.java 9 Dec 2002 18:51:29 -0000 1.4
+++ XML11DocumentScannerImpl.java 3 Apr 2003 10:58:48 -0000 1.5
@@ -388,7 +388,7 @@
XMLString nonNormalizedValue,
String atName,
XMLAttributes attributes, int attrIndex,
- boolean checkEntities)
+ boolean checkEntities,String eleName)
throws IOException, XNIException
{
// quote
@@ -564,7 +564,7 @@
}
else if (c != -1 && XML11Char.isXML11Invalid(c)) {
reportFatalError("InvalidCharInAttValue",
- new Object[] {Integer.toString(c, 16)});
+ new Object[] {Integer.toString(c,
16),atName,eleName});
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
1.39 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
Index: XMLDTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XMLDTDScannerImpl.java 3 Mar 2003 22:17:16 -0000 1.38
+++ XMLDTDScannerImpl.java 3 Apr 2003 10:58:48 -0000 1.39
@@ -1389,7 +1389,7 @@
// AttValue
boolean isVC = !fStandalone && (fSeenExternalDTD || fSeenExternalPE) ;
scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName,
- fAttributes, 0, isVC);
+ fAttributes, 0, isVC,elName);
}
return defaultType;
1.30 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
Index: XMLDocumentFragmentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XMLDocumentFragmentScannerImpl.java 3 Mar 2003 22:17:16 -0000 1.29
+++ XMLDocumentFragmentScannerImpl.java 3 Apr 2003 10:58:48 -0000 1.30
@@ -883,7 +883,7 @@
boolean isVC = fHasExternalDTD && !fStandalone;
scanAttributeValue(fTempString, fTempString2,
fAttributeQName.rawname, attributes,
- oldLen, isVC);
+ oldLen, isVC,fCurrentElement.rawname);
attributes.setValue(oldLen, fTempString.toString());
attributes.setNonNormalizedValue(oldLen, fTempString2.toString());
attributes.setSpecified(oldLen, true);
1.13 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
Index: XMLNSDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLNSDocumentScannerImpl.java 24 Mar 2003 22:00:00 -0000 1.12
+++ XMLNSDocumentScannerImpl.java 3 Apr 2003 10:58:48 -0000 1.13
@@ -391,7 +391,7 @@
// REVISIT: it seems that this function should not take attributes, and
length
scanAttributeValue(this.fTempString, fTempString2,
fAttributeQName.rawname, attributes,
- oldLen, isVC);
+ oldLen, isVC,fCurrentElement.rawname);
String value = fTempString.toString();
attributes.setValue(oldLen, value);
attributes.setNonNormalizedValue(oldLen, fTempString2.toString());
1.28 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XMLScanner.java 26 Mar 2003 04:19:22 -0000 1.27
+++ XMLScanner.java 3 Apr 2003 10:58:48 -0000 1.28
@@ -730,7 +730,7 @@
XMLString nonNormalizedValue,
String atName,
XMLAttributes attributes, int attrIndex,
- boolean checkEntities)
+ boolean checkEntities,String eleName)
throws IOException, XNIException
{
// quote
@@ -903,7 +903,7 @@
}
else if (c != -1 && isInvalidLiteral(c)) {
reportFatalError("InvalidCharInAttValue",
- new Object[] {Integer.toString(c, 16)});
+ new Object[]
{Integer.toString(c, 16),atName,eleName});
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
1.18 +1 -1
xml-xerces/java/src/org/apache/xerces/impl/msg/XMLMessages.properties
Index: XMLMessages.properties
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLMessages.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLMessages.properties 12 Feb 2003 17:10:34 -0000 1.17
+++ XMLMessages.properties 3 Apr 2003 10:58:49 -0000 1.18
@@ -65,7 +65,7 @@
# Messages common to Document and DTD
# 2.2 Characters
- InvalidCharInAttValue = An invalid XML character (Unicode: 0x{2}) was found
in the value of attribute \"{1}\".
+ InvalidCharInAttValue = An invalid XML character (Unicode: 0x{0}) was found
in the value of attribute \"{1}\" and element is \"{2}\".
InvalidCharInComment = An invalid XML character (Unicode: 0x{0}) was found
in the comment.
InvalidCharInPI = An invalid XML character (Unicode: 0x{0}) was found in
the processing instruction.
InvalidCharInInternalSubset = An invalid XML character (Unicode: 0x{0}) was
found in the internal subset of the DTD.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
