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 ch...@apache.org on 2014/07/29 09:28:33 UTC
svn commit: r1614273 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
oak-doc/
Author: chetanm
Date: Tue Jul 29 07:28:32 2014
New Revision: 1614273
URL: http://svn.apache.org/r1614273
Log:
OAK-1997 - Improve the message in UniquenessConstraintViolation exception to provide more details
Merging 1614272
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1614272
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java?rev=1614273&r1=1614272&r2=1614273&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java Tue Jul 29 07:28:32 2014
@@ -277,9 +277,10 @@ class PropertyIndexEditor implements Ind
IndexStoreStrategy s = getStrategy(true);
for (String key : keysToCheckForUniqueness) {
if (s.count(indexMeta, singleton(key), 2) > 1) {
+ String msg = String.format("Uniqueness constraint violated at path [%s] for one of the " +
+ "property in %s having value %s", getPath(), propertyNames, key);
throw new CommitFailedException(
- CONSTRAINT, 30,
- "Uniqueness constraint violated for key " + key);
+ CONSTRAINT, 30, msg);
}
}
}
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1614272