From 0219778d77e7e36392e499760a7b58412f389092 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Fri, 19 Mar 2010 17:18:42 +0000
Subject: [PATCH] SAIL-348 : Reorder rules returns 200 OK but with error
 message

 - This fix includees some refactoring
 - Tests updated



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/rule/RuleServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/rule/RuleServiceImpl.java b/source/java/org/alfresco/repo/rule/RuleServiceImpl.java
index a9c14aea2b..19c17fdf0e 100644
--- a/source/java/org/alfresco/repo/rule/RuleServiceImpl.java
+++ b/source/java/org/alfresco/repo/rule/RuleServiceImpl.java
@@ -806,8 +806,11 @@ public class RuleServiceImpl
                 {
                     orderedAssocs.add(assoc);
                 }
-            }            
-            orderedAssocs.add(index, movedAssoc);
+            }          
+            if (movedAssoc != null)
+            {
+                orderedAssocs.add(index, movedAssoc);
+            }
             
             index = 0;
             for (ChildAssociationRef orderedAssoc : orderedAssocs)