Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 391A110141 for ; Wed, 1 May 2013 08:07:57 +0000 (UTC) Received: (qmail 6280 invoked by uid 500); 1 May 2013 08:07:57 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 6223 invoked by uid 500); 1 May 2013 08:07:55 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 6193 invoked by uid 99); 1 May 2013 08:07:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 08:07:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 08:07:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 37087238899C; Wed, 1 May 2013 08:07:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1477927 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Date: Wed, 01 May 2013 08:07:31 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130501080731.37087238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed May 1 08:07:30 2013 New Revision: 1477927 URL: http://svn.apache.org/r1477927 Log: OAK-802: Occasional type validation errors in TCK setup Improved error reporting 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=1477927&r1=1477926&r2=1477927&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 Wed May 1 08:07:30 2013 @@ -120,8 +120,10 @@ class TypeEditor extends DefaultEditor { // TODO: this should be in childNodeAdded() if (parent != null && parent.effective.getDefinition( nodeName, effective.getTypeNames()) == null) { + Set parentTypes = parent.effective.getTypeNames(); throw constraintViolation( - 1, "Incorrect node type of child node " + nodeName); + 1, "No matching child node definition found for child node " + + nodeName + " in any of the parent types " + parentTypes); } } @@ -140,7 +142,7 @@ class TypeEditor extends DefaultEditor { private CommitFailedException constraintViolation(int code, String message) { return new CommitFailedException( - CONSTRAINT, code, getPath() + ": " + message + " " + typeNames); + CONSTRAINT, code, getPath() + typeNames + ": " + message); } @Override