svn commit: r1885476 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java

[mreutegg]

Author: mreutegg
Date: Thu Jan 14 08:52:39 2021
New Revision: 1885476

URL: http://svn.apache.org/viewvc?rev=1885476&view=rev
Log:
OAK-9322: Add reference node id to integrity exception message

Patch provided by Guy Pelletier

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java?rev=1885476&r1=1885475&r2=1885476&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
 Thu Jan 14 08:52:39 2021
@@ -340,7 +340,7 @@ class ReferenceEditor extends DefaultEdi
             for (String id : idsOfRemovedNodes) {
                 if (hasReferences(store, root, definition, REF_NAME, id)) {
                     throw new CommitFailedException(INTEGRITY, 1,
-                            "Unable to delete referenced node");
+                            "Unable to delete referenced node: " + id);
                 }
             }
         }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java?rev=1885476&r1=1885475&r2=1885476&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexTest.java
 Thu Jan 14 08:52:39 2021
@@ -145,7 +145,7 @@ public class ReferenceIndexTest {
         builder.getChildNode("a").remove();
 
         thrown.expect(CommitFailedException.class);
-        thrown.expectMessage("OakIntegrity0001: Unable to delete referenced 
node");
+        thrown.expectMessage("OakIntegrity0001: Unable to delete referenced 
node: u1");
         hook.processCommit(indexed, builder.getNodeState(), CommitInfo.EMPTY);
     }