From c7f6f894e49da8f8bb0b19379ba19e2792e7471c Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 14:48:14 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    127597 jkaabimofrad:
 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)       127314 jvonka: Fix RA-929
 (Error message should not be empty when creating duplicate peer association)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java b/source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
index 7eff382d00..4c67c5e14b 100644
--- a/source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
+++ b/source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
@@ -92,7 +92,7 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
             }
             catch (AssociationExistsException aee)
             {
-                throw new ConstraintViolatedException(aee.getMessage());
+                throw new ConstraintViolatedException("Node association '"+assocTypeStr+"' already exists from "+sourceNodeId+" to "+targetNodeId);
             }
             catch (IllegalArgumentException iae)
             {