Merged V2.1 to HEAD:

6556: AVM performance tweaks
   6557: WCM-758.
   6558: Fixes WCM-753.
   6559: better handling of rename, copy and paste for form instance data and renditions.  addresses WCM-752 and partially addresses WCM-559.
   6560: Renamed JndiTest.java until we decide to keep it or not.
   6561: Oops.
   6562: probable fix WCM-669      
   6563: Build fix after the removal of flushing suport 
   6564: Fix for WCM-728
   6566: Support for avm index clustering via tracking - WCM-762
   6567: Test fix after flush changes
   6568: Fixed AWC-1517: Can now create space based on existing top-level space
   6569: misc IE fixes.
   6570: Various changes to improve AVM import performance and submit performance.
   6571: Session flushing is now deprecated and doesn't fail with an exception.
   6572: Reduced the iteration count to stress nextResults calls a bit more
   6573: WS query sessions put back into cache after more results have been fetched.
   6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
   6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
   6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java

@@ -264,7 +264,7 @@ public class AVMLockingServiceImpl implements AVMLockingService
         keys.add(lock.getWebProject());
         String digest = MD5.Digest(lock.getPath().getBytes());
         keys.add(digest);
-        if (fAttributeService.getAttribute(keys) != null)
+        if (fAttributeService.exists(keys))
         {
             throw new AVMExistsException("Lock Exists: " + keys);
         }
@@ -316,8 +316,7 @@ public class AVMLockingServiceImpl implements AVMLockingService
         keys.add(WEB_PROJECTS);
         keys.add(webProject);
         keys.add(pathKey);
-        Attribute lockData = fAttributeService.getAttribute(keys);
-        if (lockData == null)
+        if (!fAttributeService.exists(keys))
         {
             return;
         }