Index: ORMNodeState.java =================================================================== RCS file: /as109b/data/KKS-V.2.0-Entw/KKS/dev/Implementierung/ContentEditor/Prod/org/apache/jackrabbit/core/state/orm/ORMNodeState.java,v retrieving revision 1.3 diff -u -r1.3 ORMNodeState.java --- ORMNodeState.java 5 Apr 2006 12:00:34 -0000 1.3 +++ ORMNodeState.java 5 Apr 2006 12:07:37 -0000 @@ -15,13 +15,14 @@ */ package org.apache.jackrabbit.core.state.orm; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.nodetype.NodeDefId; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.NodeState.ChildNodeEntry; import org.apache.jackrabbit.name.QName; -import org.apache.log4j.Logger; import java.io.Serializable; import java.util.Collection; @@ -35,7 +36,7 @@ */ public abstract class ORMNodeState implements Serializable { - private static Logger log = Logger.getLogger(ORMNodeState.class); + private final Logger log = LoggerFactory.getLogger(ORMNodeState.class); protected String uuid; protected String parentUUID; @@ -60,7 +61,16 @@ getMixinTypeNames().clear(); getParentUUIDs().clear(); uuid = state.getNodeId().getUUID().toString(); - parentUUID = state.getParentId().getUUID().toString(); + + if (state.getParentId() != null ) + { + parentUUID = state.getParentId().getUUID().toString(); + } + else + { + parentUUID = null; + } + if (state.getNodeTypeName() != null) { nodeTypeName = state.getNodeTypeName().toString(); } @@ -143,7 +153,11 @@ public void toPersistentNodeState(NodeState state) { state.setDefinitionId(NodeDefId.valueOf(getDefinitionId())); state.setNodeTypeName(QName.valueOf(getNodeTypeName())); - state.setParentId(NodeId.valueOf(getParentUUID())); + + if (getParentUUID() != null) + { + state.setParentId(NodeId.valueOf(getParentUUID())); + } Iterator childNodeEntryIter = getChildNodeEntries().iterator(); while (childNodeEntryIter.hasNext()) {