svn commit: r981813 - in /xml/security/trunk: CHANGELOG.txt src/org/apache/xml/security/utils/IdResolver.java

[co...@apache.org]

Author: coheigea
Date: Tue Aug  3 10:35:24 2010
New Revision: 981813

URL: http://svn.apache.org/viewvc?rev=981813&view=rev
Log:
Fix for bug 49692.

Modified:
    xml/security/trunk/CHANGELOG.txt
    xml/security/trunk/src/org/apache/xml/security/utils/IdResolver.java

Modified: xml/security/trunk/CHANGELOG.txt
URL: http://svn.apache.org/viewvc/xml/security/trunk/CHANGELOG.txt?rev=981813&r1=981812&r2=981813&view=diff
==============================================================================
--- xml/security/trunk/CHANGELOG.txt (original)
+++ xml/security/trunk/CHANGELOG.txt Tue Aug  3 10:35:24 2010
@@ -1,5 +1,6 @@
 Changelog for "Apache xml-security" <http://santuario.apache.org/>
 New in v1.4.4-SNAPSHOT
+    Fixed Bug 49692: Xmlsec 1.4.3 not compatible with xmlbeans 2.4.0.
     Fixed Bug 49629: Some changes to the build system.
     Fixed Bug 49483: KeyResolver.registerAtStart() leads to ClassCastException. Thanks to Clement Pellerin.
     Fixed Bug 49458: StorageResolver always exhausted after first use. Thanks to Clement Pellerin.

Modified: xml/security/trunk/src/org/apache/xml/security/utils/IdResolver.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/utils/IdResolver.java?rev=981813&r1=981812&r2=981813&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/utils/IdResolver.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/utils/IdResolver.java Tue Aug  3 10:35:24 2010
@@ -1,5 +1,5 @@
 /*
- * Copyright  1999-2004 The Apache Software Foundation.
+ * Copyright  1999-2010 The Apache Software Foundation.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -244,6 +244,9 @@ public class IdResolver {
 		    int index=s==null ? elementIndex : names.indexOf(n.getNamespaceURI());
 		    index=(index<0) ? namesLength : index;
 		    String name=n.getLocalName();
+		    if (name == null) { 
+		        name = n.getName();
+		    } 
 		    if (name.length()>2)
 		    	continue;
 		    String value=n.getNodeValue();