jkesselm 01/10/30 11:13:04
Modified: java/src/org/apache/xalan/processor XSLTElementDef.java
Log:
Improved safety net: When running with Xerces2, the "uri" field may be null.
(Also reordered tests to encourage optimization of code.)
Revision Changes Path
1.14 +4 -2
xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java
Index: XSLTElementDef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLTElementDef.java 2001/03/29 22:39:33 1.13
+++ XSLTElementDef.java 2001/10/30 19:13:04 1.14
@@ -367,7 +367,9 @@
int len1 = (s1 == null) ? 0 : s1.length();
int len2 = (s2 == null) ? 0 : s2.length();
- return (len1 != len2) ? false : (len1 == 0) ? true : s1.equals(s2);
+ return (len1 != len2) ? false
+ : (len1 == 0) ? true
+ :
s1.equals(s2);
}
/** Content type enumerations */
@@ -622,7 +624,7 @@
String nameDef = attrDef.getName();
if (nameDef.equals("*") && (equalsMayBeNullOrZeroLen(uri, uriDef) ||
- (uriDef != null && uri.length() > 0 && uriDef.equals("*"))))
+ (uriDef != null && uriDef.equals("*") && uri!=null && uri.length()
> 0 )))
{
return attrDef;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
