inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2008-12-18 17:10:36 +00:00
parent 9f42bfac4c
commit ab4bdfc013
38 changed files with 2011 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
source/java/org/alfresco/repo/domain/hibernate/NodeAssocImpl.java
View File

@@ -31,8 +31,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.alfresco.repo.domain.Node;
import org.alfresco.repo.domain.NodeAssoc;
import org.alfresco.repo.domain.QNameEntity;
import org.alfresco.repo.domain.QNameDAO;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
/**
@@ -48,11 +49,12 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
private Long version;
private Node source;
private Node target;
private QNameEntity typeQName;
private Long typeQNameId;
private transient ReadLock refReadLock;
private transient WriteLock refWriteLock;
private transient AssociationRef nodeAssocRef;
private transient QName typeQName;
public NodeAssocImpl()
{
@@ -68,7 +70,7 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
this.setSource(sourceNode);
}
public AssociationRef getNodeAssocRef()
public AssociationRef getNodeAssocRef(QNameDAO qnameDAO)
{
boolean trashReference = false;
// first check if it is available
@@ -98,12 +100,16 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
refWriteLock.lock();
try
{
if (typeQName == null)
{
typeQName = qnameDAO.getQName(typeQNameId).getSecond();
}
// double check
if (nodeAssocRef == null || trashReference)
{
nodeAssocRef = new AssociationRef(
getSource().getNodeRef(),
this.typeQName.getQName(),
this.typeQName,
getTarget().getNodeRef());
}
return nodeAssocRef;
@@ -114,13 +120,54 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
}
}
public QName getTypeQName(QNameDAO qnameDAO)
{
refReadLock.lock();
try
{
if (typeQName != null)
{
return typeQName;
}
}
finally
{
refReadLock.unlock();
}
// get write lock
refWriteLock.lock();
try
{
typeQName = qnameDAO.getQName(typeQNameId).getSecond();
return typeQName;
}
finally
{
refWriteLock.unlock();
}
}
public void setTypeQName(QNameDAO qnameDAO, QName typeQName)
{
Long typeQNameId = qnameDAO.getOrCreateQName(typeQName).getFirst();
refWriteLock.lock();
try
{
setTypeQNameId(typeQNameId);
}
finally
{
refWriteLock.unlock();
}
}
public String toString()
{
StringBuffer sb = new StringBuffer(32);
sb.append("NodeAssoc")
.append("[ source=").append(source)
.append(", target=").append(target)
.append(", name=").append(getTypeQName())
.append(", type=").append(typeQNameId)
.append("]");
return sb.toString();
}
@@ -140,14 +187,22 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
return false;
}
NodeAssoc that = (NodeAssoc) obj;
return (EqualsHelper.nullSafeEquals(this.getTypeQName(), that.getTypeQName())
&& EqualsHelper.nullSafeEquals(this.getTarget(), that.getTarget())
&& EqualsHelper.nullSafeEquals(this.getSource(), that.getSource()));
if (EqualsHelper.nullSafeEquals(this.typeQNameId, that.getId()))
{
return true;
}
else
{
return (EqualsHelper.nullSafeEquals(this.typeQNameId, that.getTypeQNameId())
&& EqualsHelper.nullSafeEquals(this.getTarget(), that.getTarget())
&& EqualsHelper.nullSafeEquals(this.getSource(), that.getSource())
);
}
}
public int hashCode()
{
return (typeQName == null ? 0 : typeQName.hashCode());
return (typeQNameId == null ? 0 : typeQNameId.hashCode());
}
public Long getId()
@@ -222,18 +277,19 @@ public class NodeAssocImpl implements NodeAssoc, Serializable
}
}
public QNameEntity getTypeQName()
public Long getTypeQNameId()
{
return typeQName;
return typeQNameId;
}
public void setTypeQName(QNameEntity typeQName)
public void setTypeQNameId(Long typeQNameId)
{
refWriteLock.lock();
try
{
this.typeQName = typeQName;
this.typeQNameId = typeQNameId;
this.nodeAssocRef = null;
this.typeQName = null;
}
finally
{