You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/01/31 15:00:56 UTC
svn commit: r1238549 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
Author: jukka
Date: Tue Jan 31 14:00:55 2012
New Revision: 1238549
URL: http://svn.apache.org/viewvc?rev=1238549&view=rev
Log:
2.4: Merged revision 1236709 (JCR-3223)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 14:00:55 2012
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236775,1236819-1236821
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236709,1236775,1236819-1236821
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?rev=1238549&r1=1238548&r2=1238549&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java Tue Jan 31 14:00:55 2012
@@ -77,6 +77,20 @@ public class NodeTypeRegistry implements
"/nodetypes/custom_nodetypes.xml";
/**
+ * Feature flag for the unfortunate behavior in Jackrabbit 2.1 and 2.2
+ * where the exception from {@link #checkForReferencesInContent(Name)}
+ * was never thrown because of a mistaken commit for
+ * <a href="https://issues.apache.org/jira/browse/JCR-2587">JCR-2587</a>.
+ * Setting this flag to <code>true</code> (the default value comes from
+ * the "disableCheckForReferencesInContentException" system property)
+ * will disable the exception thrown by default by the method.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-3223">JCR-3223</a>
+ */
+ public static volatile boolean disableCheckForReferencesInContentException =
+ Boolean.getBoolean("disableCheckForReferencesInContentException");
+
+ /**
* resource holding custom node type definitions which are represented as
* nodes in the repository; it is needed in order to make the registrations
* persistent.
@@ -978,7 +992,18 @@ public class NodeTypeRegistry implements
*/
protected void checkForReferencesInContent(Name nodeTypeName)
throws RepositoryException {
- throw new RepositoryException("not yet implemented");
+ if (!disableCheckForReferencesInContentException) {
+ throw new RepositoryException(
+ "The check for the existence of content using the"
+ + " given node type is not yet implemented, so to"
+ + " guarantee repository consistency the request to"
+ + " unregister the type is denied. Contributions to"
+ + " implement this feature would be welcome! To restore"
+ + " the broken behavior of previous Jackrabbit versions"
+ + " where this check was simply skipped, please set the"
+ + " disableCheckForReferencesInContentException system"
+ + " property to true.");
+ }
}
//-------------------------------------------------------< implementation >