You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/10/11 16:46:37 UTC

svn commit: r1764299 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java

Author: mduerig
Date: Tue Oct 11 16:46:37 2016
New Revision: 1764299

URL: http://svn.apache.org/viewvc?rev=1764299&view=rev
Log:
OAK-4925: Don't call @Nonnull TypeEditor.getEffective() from constructor
Don't call @Nonull method before underlying field is initialised

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1764299&r1=1764298&r2=1764299&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Tue Oct 11 16:46:37 2016
@@ -144,7 +144,7 @@ class TypeEditor extends DefaultEditor {
      */
     private void constraintViolation(int code, String message) throws CommitFailedException {
         String path = getPath();
-        path = path + '[' + getEffective() + ']';
+        path = path + '[' + effective + ']';
 
         CommitFailedException exception = new CommitFailedException(CONSTRAINT, code, path + ": " + message);
         if (strict) {