[exo-jcr-commits] exo-jcr SVN: r1176 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: pnedonosko
Date: 2009-12-25 04:12:27 -0500 (Fri, 25 Dec 2009)
New Revision: 1176

Modified:
   jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
Log:
EOXJCR-325 SysView initializer fix for null mixins

Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java	2009-12-25 09:09:39 UTC (rev 1175)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java	2009-12-25 09:12:27 UTC (rev 1176)
@@ -56,8 +56,6 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Stack;
 
 import javax.jcr.NamespaceException;
@@ -77,7 +75,7 @@
  * Should be configured with restore-path parameter. The path to a backup result file.
  * 
  * @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
- * @version $Id: SysViewWorkspaceInitializer.java 34801 2009-07-31 15:44:50Z dkatayev $
+ * @version $Id$
  */
 
 public class SysViewWorkspaceInitializer implements WorkspaceInitializer
@@ -300,8 +298,7 @@
       }
    }
 
-   protected class SVNodeData
-      extends TransientNodeData
+   protected class SVNodeData extends TransientNodeData
    {
 
       int orderNumber = 0;
@@ -334,7 +331,7 @@
             childNodesMap.put(childName, 1);
 
          int index = childNodesMap.get(childName);
-         return new int[] {orderNumber++, index};
+         return new int[]{orderNumber++, index};
       }
    }
 
@@ -685,8 +682,12 @@
                      {
                         // change current context
                         // - pop parent from the stack
-                        parents.pop();
-
+                        SVNodeData parent = parents.pop();
+                        if (parent.getMixinTypeNames() == null)
+                        {
+                           // mixins cannot be null
+                           parent.setMixinTypeNames(new InternalQName[0]);
+                        }
                      }
                      else if (Constants.SV_PROPERTY.equals(lname))
                      {


Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
___________________________________________________________________
Name: svn:keywords
   + Id