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 F293CD106 for ; Fri, 30 Nov 2012 14:55:47 +0000 (UTC) Received: (qmail 85276 invoked by uid 500); 30 Nov 2012 14:55:47 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 85261 invoked by uid 500); 30 Nov 2012 14:55:47 -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 85250 invoked by uid 99); 30 Nov 2012 14:55:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 14:55:47 +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; Fri, 30 Nov 2012 14:55:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B4B5C23889FA; Fri, 30 Nov 2012 14:55:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1415669 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java Date: Fri, 30 Nov 2012 14:55:26 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121130145526.B4B5C23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Fri Nov 30 14:55:25 2012 New Revision: 1415669 URL: http://svn.apache.org/viewvc?rev=1415669&view=rev Log: OAK-479: Adding a node to a node that doesn't accept children doesn't fail with ConstraintViolationException Correct error message Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java?rev=1415669&r1=1415668&r2=1415669&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java Fri Nov 30 14:55:25 2012 @@ -316,7 +316,7 @@ public abstract class ReadOnlyNodeTypeMa } } - throw new RepositoryException("No matching node definition found for " + this); + throw new RepositoryException("No matching node definition found for " + nodeName); } @Override @@ -358,7 +358,7 @@ public abstract class ReadOnlyNodeTypeMa } } - throw new RepositoryException("No matching node definition found for " + this); + throw new RepositoryException("No matching node definition found for " + targetNode.getName()); } @Override @@ -367,7 +367,7 @@ public abstract class ReadOnlyNodeTypeMa NodeDefinition def = getDefinitionOrNull(parentNodeTypes, nodeName, nodeType); if (def == null) { - throw new RepositoryException("No matching node definition found for " + this); + throw new RepositoryException("No matching node definition found for " + nodeName); } return def; @@ -474,7 +474,7 @@ public abstract class ReadOnlyNodeTypeMa } } - throw new RepositoryException("No matching property definition found for " + this); + throw new RepositoryException("No matching property definition found for " + targetProperty.getName()); } @Override