minchau 2003/10/24 08:45:57
Modified: java/src/org/apache/xml/utils Tag: xslt20-compiled
QName.java
java/src/org/apache/xml/res Tag: xslt20-compiled
XMLErrorResources.java
Log:
Patch for bug 3415 from Richard Cao.
Reviewed/Committed by Brian Minchau
Revision Changes Path
No revision
No revision
1.12.6.1 +12 -3 xml-xalan/java/src/org/apache/xml/utils/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/QName.java,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -r1.12 -r1.12.6.1
--- QName.java 30 Jan 2003 18:46:19 -0000 1.12
+++ QName.java 24 Oct 2003 15:45:57 -0000 1.12.6.1
@@ -487,10 +487,19 @@
XMLErrorResources.ER_PREFIX_MUST_RESOLVE,
new Object[]{ prefix })); //"Prefix must resolve to a
namespace: "+prefix);
}
+ _localName = qname.substring(indexOfNSSep + 1);
}
-
- _localName = (indexOfNSSep < 0)
- ? qname : qname.substring(indexOfNSSep + 1);
+ else if (indexOfNSSep == 0)
+ {
+ throw new RuntimeException(
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_NAME_CANT_START_WITH_COLON,
+ null));
+ }
+ else
+ {
+ _localName = qname;
+ }
if (validate)
{
No revision
No revision
1.4.4.2 +4 -0
xml-xalan/java/src/org/apache/xml/res/XMLErrorResources.java
Index: XMLErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/res/XMLErrorResources.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- XMLErrorResources.java 23 Oct 2003 18:20:10 -0000 1.4.4.1
+++ XMLErrorResources.java 24 Oct 2003 15:45:57 -0000 1.4.4.2
@@ -190,6 +190,7 @@
public static final String ER_ARG_LOCALNAME_NULL =
"ER_ARG_LOCALNAME_NULL";
public static final String ER_ARG_LOCALNAME_INVALID =
"ER_ARG_LOCALNAME_INVALID";
public static final String ER_ARG_PREFIX_INVALID =
"ER_ARG_PREFIX_INVALID";
+ public static final String ER_NAME_CANT_START_WITH_COLON =
"ER_NAME_CANT_START_WITH_COLON";
// Message keys used by the serializer
public static final String ER_RESOURCE_COULD_NOT_FIND =
"ER_RESOURCE_COULD_NOT_FIND";
@@ -408,6 +409,9 @@
// that there is a problem with that part of the QNAME.
{ ER_ARG_PREFIX_INVALID,
"Prefix in QNAME should be a valid NCName"},
+
+ { ER_NAME_CANT_START_WITH_COLON,
+ "Name cannot start with a colon"},
{ "BAD_CODE", "Parameter to createMessage was out of bounds"},
{ "FORMAT_FAILED", "Exception thrown during messageFormat call"},
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
