Ergänzung zu Bugfix 197: Berücksichtigung, dass leere Listevon Prefixes gleichbedeutend ist mit nicht vorhandener Liste (null).

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@187 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 9 insertions, 4 deletions

diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
index f50d0d9b1..b38fbe128 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
@@ -60,10 +60,15 @@ public class ExclusiveCanonicalizationImpl
    * @see java.lang.Object#equals(Object)
    */
   public boolean equals(Object other) {
-    if (other instanceof ExclusiveCanonicalizationImpl) {
-      ExclusiveCanonicalizationImpl c14n =
-        (ExclusiveCanonicalizationImpl) other;
-      return getAlgorithmURI().equals(c14n.getAlgorithmURI());
+    if (other instanceof ExclusiveCanonicalization) {
+      ExclusiveCanonicalization eC14n =
+        (ExclusiveCanonicalization) other;
+      boolean algURIEquals = getAlgorithmURI().equals(eC14n.getAlgorithmURI());
+      boolean inclNSPrefs = 
+        (getInclusiveNamespacePrefixes() == null || getInclusiveNamespacePrefixes().isEmpty())
+        ? eC14n.getInclusiveNamespacePrefixes() == null || eC14n.getInclusiveNamespacePrefixes().isEmpty()
+        : getInclusiveNamespacePrefixes().equals(eC14n.getInclusiveNamespacePrefixes());
+      return algURIEquals && inclNSPrefs;
     }
     return false;
   }