svn commit: r122971 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java

[st...@apache.org]

Author: stefan
Date: Tue Dec 21 08:21:10 2004
New Revision: 122971

URL: http://svn.apache.org/viewcvs?view=rev&rev=122971
Log:
NodeTypeRegistry.reregisterNodeType: silently ignore if node type definition has not been modified
Modified:
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
Url: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?view=diff&rev=122971&p1=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java&r1=122970&p2=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java&r2=122971
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java	Tue Dec 21 08:21:10 2004
@@ -1295,13 +1295,14 @@
         NodeTypeDef ntdOld = (NodeTypeDef) registeredNTDefs.get(name);
         NodeTypeDefDiff diff = NodeTypeDefDiff.create(ntdOld, ntd);
         if (!diff.isModified()) {
-            throw new RepositoryException(name.toString() + ": not modified");
+	    // the definition has been modified, there's nothing to do here...
+	    return getEffectiveNodeType(name);
         }
         if (diff.isTrivial()) {
             /**
              * the change is trivial and has no effect on current content
-             * (e.g. that would be the case when non-mandatory properties were
-             * added);
+             * (e.g. that would be the case when non-mandatory properties had
+	     * been added);
              * re-register node type definition and update caches &
              * notify listeners on re-registration
              */