Author: alexparvulescu Date: Wed Apr 30 20:12:24 2014 New Revision: 1591468
URL: http://svn.apache.org/r1591468 Log: OAK-1787 RepositoryException thrown instead of InvalidItemStateException - merged to 1.0 branch Modified: jackrabbit/oak/branches/1.0/ (props changed) jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java Propchange: jackrabbit/oak/branches/1.0/ ------------------------------------------------------------------------------ Merged /jackrabbit/oak/trunk:r1591467 Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java?rev=1591468&r1=1591467&r2=1591468&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java (original) +++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java Wed Apr 30 20:12:24 2014 @@ -235,6 +235,8 @@ public class CommitFailedException exten return new ReferentialIntegrityException(message, this); } else if (isOfType(STATE)) { return new InvalidItemStateException(message, this); + } else if (isOfType(MERGE)) { + return new InvalidItemStateException(message, this); } else if (isOfType(VERSION)) { return new VersionException(message, this); } else if (isOfType(LABEL_EXISTS)) {
