Merged V3.0 to HEAD

12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
   12085: ETHREEOH-565: Failure to generate flash preview for PPT file
   12086: ETHREEOH-903 	 Sites drop-down Favorites UI improvements
          ETHREEOH-904 	 My Sites dashlet Favorites UI improvements
          ETHREEOH-547 	 User who is not a site manager can delete sites: my sites dashlet and sites page
   12093: ETHREEOH-861, ETHREEOH-928
   12094: Remove __MACOSX folder that has appeared in Share webapp
   12096: Removed spurious files from YUI 2.6.0 distribution
   12100: ETHREEOH-929   Tightening up transport adapters field (should never be shown for ASR)
   12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
   12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
   12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12115: Added unit test to check for cm:folder-derived type support
   12116: Removed unused, old patch-related query
   12117: Merged V2.2 to V3.0
      11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
   12118: Fixed compilation error after merge
   12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
   12122: UserUsage does nothing if system is READ-ONLY.

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

source/java/org/alfresco/repo/domain/hibernate/DbPermissionImpl.java

@@ -25,10 +25,13 @@
 package org.alfresco.repo.domain.hibernate;
 
 import java.io.Serializable;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.alfresco.repo.domain.DbPermission;
 import org.alfresco.repo.domain.DbPermissionKey;
-import org.alfresco.repo.domain.QNameEntity;
+import org.alfresco.repo.domain.QNameDAO;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.EqualsHelper;
 import org.hibernate.Session;
@@ -44,12 +47,19 @@ public class DbPermissionImpl implements DbPermission, Serializable
 
     private Long id;
     private Long version;
-    private QNameEntity typeQName;
+    private Long typeQNameId;
     private String name;
 
+    private transient ReadLock refReadLock;
+    private transient WriteLock refWriteLock;
+    private transient QName typeQName;
+
     public DbPermissionImpl()
     {
         super();
+        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+        refReadLock = lock.readLock();
+        refWriteLock = lock.writeLock();
     }
 
     @Override
@@ -59,7 +69,7 @@ public class DbPermissionImpl implements DbPermission, Serializable
         sb.append("DbPermissionImpl")
           .append("[ id=").append(id)
           .append(", version=").append(version)
-          .append(", typeQName=").append(typeQName.getQName())
+          .append(", typeQName=").append(typeQNameId)
           .append(", name=").append(getName())
           .append("]");
         return sb.toString();
@@ -77,13 +87,41 @@ public class DbPermissionImpl implements DbPermission, Serializable
             return false;
         }
         DbPermission other = (DbPermission) o;
-        return (EqualsHelper.nullSafeEquals(typeQName, other.getTypeQName())) && (EqualsHelper.nullSafeEquals(name, other.getName()));
+        return (EqualsHelper.nullSafeEquals(typeQNameId, other.getTypeQNameId()))
+                && (EqualsHelper.nullSafeEquals(name, other.getName())
+                        );
     }
 
     @Override
     public int hashCode()
     {
-        return typeQName.hashCode() + (37 * name.hashCode());
+        return typeQNameId.hashCode() + (37 * name.hashCode());
+    }
+
+    public QName getTypeQName(QNameDAO qnameDAO)
+    {
+        refReadLock.lock();
+        try
+        {
+            if (typeQName != null)
+            {
+                return typeQName;
+            }
+        }
+        finally
+        {
+            refReadLock.unlock();
+        }
+        refWriteLock.lock();
+        try
+        {
+            typeQName = qnameDAO.getQName(typeQNameId).getSecond();
+            return typeQName;
+        }
+        finally
+        {
+            refWriteLock.unlock();
+        }
     }
 
     public Long getId()
@@ -114,14 +152,23 @@ public class DbPermissionImpl implements DbPermission, Serializable
         this.version = version;
     }
 
-    public QNameEntity getTypeQName()
+    public Long getTypeQNameId()
     {
-        return typeQName;
+        return typeQNameId;
     }
 
-    public void setTypeQName(QNameEntity typeQName)
+    public void setTypeQNameId(Long typeQNameId)
     {
-        this.typeQName = typeQName;
+        refWriteLock.lock();
+        try
+        {
+            this.typeQNameId = typeQNameId;
+            this.typeQName = null;
+        }
+        finally
+        {
+            refWriteLock.unlock();
+        }
     }
 
     public String getName()
@@ -136,7 +183,7 @@ public class DbPermissionImpl implements DbPermission, Serializable
 
     public DbPermissionKey getKey()
     {
-        return new DbPermissionKey(typeQName.getQName(), name);
+        return new DbPermissionKey(typeQNameId, name);
     }
 
     /**