You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2004/12/15 16:36:25 UTC
svn commit: r111978 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
Author: tripod
Date: Wed Dec 15 07:36:23 2004
New Revision: 111978
URL: http://svn.apache.org/viewcvs?view=rev&rev=111978
Log:
- temporary fix for jira bug JCR-31
Modified:
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
Url: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java?view=diff&rev=111978&p1=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java&r1=111977&p2=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java&r2=111978
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Wed Dec 15 07:36:23 2004
@@ -326,9 +326,14 @@
// create with new uuid? what about reference values refering to given uuid?
}
if (state.parent.hasNode(state.nodeName)) {
- NodeDef def = state.parent.getNode(state.nodeName).getDefinition();
- if (def.isProtected() || def.isAutoCreate()) {
+ state.node = state.parent.getNode(state.nodeName);
+ NodeDef def = state.node.getDefinition();
+ if (def.isProtected()) {
+ // @todo how to handle protected/auto-created child node?
+ return;
+ } else if (def.isAutoCreate()) {
// @todo how to handle protected/auto-created child node?
+ return;
}
}