You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2012/04/01 15:02:25 UTC

svn commit: r1308094 - /chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java

Author: fmui
Date: Sun Apr  1 13:02:25 2012
New Revision: 1308094

URL: http://svn.apache.org/viewvc?rev=1308094&view=rev
Log:
CMIS-518: applied patch

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java?rev=1308094&r1=1308093&r2=1308094&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java Sun Apr  1 13:02:25 2012
@@ -2634,9 +2634,9 @@ public final class Converter {
             Node child = children.item(i);
 
             if (child.getNodeType() == Node.ELEMENT_NODE) {
-                CmisExtensionElement cimsChild = convertDomToCmisExtensionElement(child);
-                if (cimsChild != null) {
-                    cmisChildren.add(cimsChild);
+                CmisExtensionElement cmisChild = convertDomToCmisExtensionElement(child);
+                if (cmisChild != null) {
+                    cmisChildren.add(cmisChild);
                 }
             } else if (child.getNodeType() == Node.TEXT_NODE) {
                 value.append(child.getNodeValue());
@@ -2648,7 +2648,12 @@ public final class Converter {
             attributes = new HashMap<String, String>();
             for (int i = 0; i < node.getAttributes().getLength(); i++) {
                 Node attrNode = node.getAttributes().item(i);
+                
+                String attrNamespace = attrNode.getNamespaceURI();
+                
+                if (attrNamespace == null || attrNamespace.equals(namespace)) { 
                 attributes.put(attrNode.getLocalName(), attrNode.getNodeValue());
+                }
             }
         }