From d48bb082135bd6368479bd65a0e94f83520984d7 Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Mon, 19 Jun 2006 12:58:04 +0000
Subject: [PATCH] Fix AR-641

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3150 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../ldap/LDAPGroupExportSource.java           | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/java/org/alfresco/repo/security/authentication/ldap/LDAPGroupExportSource.java b/source/java/org/alfresco/repo/security/authentication/ldap/LDAPGroupExportSource.java
index 013760b20e..1177bfef29 100644
--- a/source/java/org/alfresco/repo/security/authentication/ldap/LDAPGroupExportSource.java
+++ b/source/java/org/alfresco/repo/security/authentication/ldap/LDAPGroupExportSource.java
@@ -280,6 +280,23 @@ public class LDAPGroupExportSource implements ExportSource, InitializingBean
                 ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
                         .toPrefixString(namespaceService), attrs);
 
+        if ((authorityDAO != null ) && authorityDAO.authorityExists(group.gid))
+        {
+            NodeRef authNodeRef = authorityDAO.getAuthorityNodeRefOrNull(group.gid);
+            if (authNodeRef != null)
+            {
+                String uguid = authorityDAO.getAuthorityNodeRefOrNull(group.gid).getId();
+
+                writer.startElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
+                        .toPrefixString(namespaceService), new AttributesImpl());
+
+                writer.characters(uguid.toCharArray(), 0, uguid.length());
+
+                writer.endElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
+                        .toPrefixString(namespaceService));
+            }
+        }
+        
         writer.startElement(ContentModel.PROP_AUTHORITY_NAME.getNamespaceURI(), ContentModel.PROP_AUTHORITY_NAME
                 .getLocalName(), ContentModel.PROP_AUTHORITY_NAME.toPrefixString(namespaceService),
                 new AttributesImpl());
@@ -314,23 +331,6 @@ public class LDAPGroupExportSource implements ExportSource, InitializingBean
             addgroup(lookup, child, writer);
         }
 
-        if ((authorityDAO != null ) && authorityDAO.authorityExists(group.gid))
-        {
-            NodeRef authNodeRef = authorityDAO.getAuthorityNodeRefOrNull(group.gid);
-            if (authNodeRef != null)
-            {
-                String uguid = authorityDAO.getAuthorityNodeRefOrNull(group.gid).getId();
-
-                writer.startElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
-                        .toPrefixString(namespaceService), new AttributesImpl());
-
-                writer.characters(uguid.toCharArray(), 0, uguid.length());
-
-                writer.endElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
-                        .toPrefixString(namespaceService));
-            }
-        }
-
         writer.endElement(ContentModel.TYPE_AUTHORITY_CONTAINER.getNamespaceURI(),
                 ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
                         .toPrefixString(namespaceService));