Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
In directory 
james.mmbase.org:/tmp/cvs-serv18642/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans

Modified Files:
        CreateRelationsForSecondaryContent.java 
Log Message:
CMSC-1192 - add SQL script to migrate all images/attachments/URLs to new 
assetstable - adding null checks


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
See also: http://www.mmbase.org/jira/browse/CMSC-1192


Index: CreateRelationsForSecondaryContent.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans/CreateRelationsForSecondaryContent.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- CreateRelationsForSecondaryContent.java     10 Feb 2009 12:29:54 -0000      
1.15
+++ CreateRelationsForSecondaryContent.java     12 Feb 2009 09:32:52 -0000      
1.16
@@ -67,7 +67,7 @@
       
       for (int i = 0; i < assets.size(); i++) {
          Node asset = assets.getNode(i);
-         if (assets != null && !RepositoryUtil.hasCreationChannel(asset)) {
+         if (asset != null && !RepositoryUtil.hasCreationChannel(asset)) {
             counter++;
             Relation relation = null;
             // If type is not null, it means someone has picked selfselect. We 
will now try to determine
@@ -114,8 +114,10 @@
          }
          //Add a version for a asset element.
          try {
+            if(asset != null) {
             Versioning.addVersion(asset);
          } 
+         } 
          catch (VersioningException e) {
            log.error("Add version error for node"+asset.getNumber(),e);
          }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to