You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2004/09/18 18:47:35 UTC
cvs commit: xml-security/src/org/apache/xml/security/utils XMLUtils.java
raul 2004/09/18 09:47:35
Modified: src/org/apache/xml/security/utils/resolver/implementations
ResolverFragment.java ResolverXPointer.java
src/org/apache/xml/security/utils XMLUtils.java
Log:
easy fix to make work arround a crimson issue(there is anybody that still use it).
Revision Changes Path
1.20 +2 -2 xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
Index: ResolverFragment.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ResolverFragment.java 3 Aug 2004 18:01:22 -0000 1.19
+++ ResolverFragment.java 18 Sep 2004 16:47:35 -0000 1.20
@@ -57,7 +57,7 @@
{
String uriNodeValue = uri.getNodeValue();
- Document doc = uri.getOwnerDocument();
+ Document doc = uri.getOwnerElement().getOwnerDocument();
Node selectedElem = null;
1.20 +2 -2 xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
Index: ResolverXPointer.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ResolverXPointer.java 3 Aug 2004 18:01:22 -0000 1.19
+++ ResolverXPointer.java 18 Sep 2004 16:47:35 -0000 1.20
@@ -66,7 +66,7 @@
throws ResourceResolverException {
Node resultNode = null;
- Document doc = uri.getOwnerDocument();
+ Document doc = uri.getOwnerElement().getOwnerDocument();
// this must be done so that Xalan can catch ALL namespaces
//XMLUtils.circumventBug2650(doc);
1.41 +5 -1 xml-security/src/org/apache/xml/security/utils/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/utils/XMLUtils.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XMLUtils.java 3 Aug 2004 18:01:22 -0000 1.40
+++ XMLUtils.java 18 Sep 2004 16:47:35 -0000 1.41
@@ -610,10 +610,14 @@
Iterator iterator = xpathNodeSet.iterator();
while(iterator.hasNext()) {
Node node = (Node) iterator.next();
- if (node.getNodeType() == Node.DOCUMENT_NODE) {
+ int nodeType =node.getNodeType();
+ if (nodeType == Node.DOCUMENT_NODE) {
return (Document) node;
}
try {
+ if (nodeType==Node.ATTRIBUTE_NODE) {
+ return ((Attr)node).getOwnerElement().getOwnerDocument();
+ }
return node.getOwnerDocument();
} catch (NullPointerException e) {
npe = e;