Re: Changes in ElementProxy

[Vishal Mahajan]

Hi Raul,

I have attached a couple of diffs that would also be required, without 
which my tests fail. I am doing some more testing and will let you know 
if I find anything more.

Thanks!
Vishal

on 1/2/2008 3:15 AM Raul Benito wrote:

Hello everybody and happy 2008,
I wish that this new year I can give more love to the Santuario
project. There are a lot of plans and a lack of time, let see what
happens...

In the meantime and for warming up I have do some refactoring of
ElementProxy to implement the fix for bug before
http://issues.apache.org/bugzilla/show_bug.cgi?id=40897, I will commit
in one week but can the people that have the problem test it before.

Regards,

Raul


  

--- XMLUtils.java.bak   2008-01-08 12:28:20.474094000 +0530
+++ XMLUtils.java       2008-01-08 15:15:31.289994400 +0530
@@ -536,7 +536,7 @@
    public static Element selectDsNode(Node sibling, String nodeName, int 
number) {
        while (sibling!=null) {
                if (nodeName.equals(sibling.getLocalName())
-                               && 
Constants.SignatureSpecNS==sibling.getNamespaceURI()) {
+                               && 
Constants.SignatureSpecNS.equals(sibling.getNamespaceURI())) {
                        if (number==0){
                                return (Element)sibling;
                        }
@@ -557,7 +557,7 @@
    public static Element selectXencNode(Node sibling, String nodeName, int 
number) {
        while (sibling!=null) {
                if (nodeName.equals(sibling.getLocalName())
-                               && 
EncryptionConstants.EncryptionSpecNS==sibling.getNamespaceURI()) {
+                               && 
EncryptionConstants.EncryptionSpecNS.equals(sibling.getNamespaceURI())) {
                        if (number==0){
                                return (Element)sibling;
                        }
@@ -616,7 +616,7 @@
    public static Element selectNode(Node sibling, String uri,String nodeName, 
int number) {
        while (sibling!=null) {
                if (nodeName.equals(sibling.getLocalName())
-                               && uri==sibling.getNamespaceURI()) {
+                               && uri.equals(sibling.getNamespaceURI())) {
                        if (number==0){
                                return (Element)sibling;
                        }
@@ -648,7 +648,7 @@
        //List list=new ArrayList();
        while (sibling!=null) {
                if (nodeName.equals(sibling.getLocalName())
-                               && uri==sibling.getNamespaceURI()) {
+                               && uri.equals(sibling.getNamespaceURI())) {
                        a[curr++]=(Element)sibling;
                        if (size<=curr) {
                                int cursize= size<<2;
--- ElementProxy.java.bak       2008-01-08 12:36:07.582264000 +0530
+++ ElementProxy.java   2008-01-08 15:26:52.846928300 +0530
@@ -436,7 +436,7 @@
            while (sibling!=null) {        
                if (localname.equals(sibling.getLocalName())
                                &&  
-                                       namespace==sibling.getNamespaceURI() ) 
{            
+                                       
namespace.equals(sibling.getNamespaceURI()) ) {
                        number++;
                }
                sibling=sibling.getNextSibling();