You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2007/08/07 22:39:03 UTC

svn commit: r563648 - /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java

Author: clombart
Date: Tue Aug  7 13:39:02 2007
New Revision: 563648

URL: http://svn.apache.org/viewvc?view=rev&rev=563648
Log:
Apply patch for JCR-1044

Modified:
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java?view=diff&rev=563648&r1=563647&r2=563648
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java Tue Aug  7 13:39:02 2007
@@ -174,9 +174,10 @@
         }
 
         // Delete JCR nodes that are not present in the collection
-        if (elementClassDescriptor.hasIdField()) {
-            Iterator nodeIterator = this.getCollectionNodes(session, parentNode,
-                    elementClassDescriptor.getJcrType()).iterator();
+         Collection collectionNodes = this.getCollectionNodes(session, parentNode, 
+        		                                              elementClassDescriptor.getJcrType());
+         if (collectionNodes != null && elementClassDescriptor.hasIdField()) {
+            Iterator nodeIterator = collectionNodes.iterator();
 
             while (nodeIterator.hasNext()) {
                 Node child = (Node) nodeIterator.next();