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

Build Fix for failing permission test (missing flush in DAO)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2009-10-22 19:57:16 +00:00
parent 7a67737f99
commit b990648554
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
View File

@@ -1589,6 +1589,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
acl.setInherits(Boolean.TRUE); acl.setInherits(Boolean.TRUE);
aclCache.remove(id); aclCache.remove(id);
changes.add(new AclChangeImpl(id, id, acl.getAclType(), acl.getAclType())); changes.add(new AclChangeImpl(id, id, acl.getAclType(), acl.getAclType()));
DirtySessionMethodInterceptor.flushSession(getSession(), true);
return changes; return changes;
case SHARED: case SHARED:
// TODO support a list of children and casacade if given // TODO support a list of children and casacade if given
@@ -1603,6 +1604,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
getWritable(id, null, null, null, null, false, changes, WriteMode.COPY_ONLY); getWritable(id, null, null, null, null, false, changes, WriteMode.COPY_ONLY);
acl = (DbAccessControlList) getHibernateTemplate().get(DbAccessControlListImpl.class, changes.get(0).getAfter()); acl = (DbAccessControlList) getHibernateTemplate().get(DbAccessControlListImpl.class, changes.get(0).getAfter());
acl.setInherits(Boolean.TRUE); acl.setInherits(Boolean.TRUE);
DirtySessionMethodInterceptor.flushSession(getSession(), true);
} }
else else
{ {
@@ -1630,6 +1632,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
acl.setInherits(Boolean.FALSE); acl.setInherits(Boolean.FALSE);
aclCache.remove(id); aclCache.remove(id);
changes.add(new AclChangeImpl(id, id, acl.getAclType(), acl.getAclType())); changes.add(new AclChangeImpl(id, id, acl.getAclType(), acl.getAclType()));
DirtySessionMethodInterceptor.flushSession(getSession(), true);
return changes; return changes;
case SHARED: case SHARED:
// TODO support a list of children and casacade if given // TODO support a list of children and casacade if given
@@ -1669,6 +1672,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
inheritedAcl.setRequiresVersion(true); inheritedAcl.setRequiresVersion(true);
aclCache.remove(inheritedId); aclCache.remove(inheritedId);
} }
DirtySessionMethodInterceptor.flushSession(getSession(), true);
return toCopy; return toCopy;
case REDIRECT: case REDIRECT:
if ((toInheritFrom != null) && (toInheritFrom == toCopy)) if ((toInheritFrom != null) && (toInheritFrom == toCopy))
@@ -1747,6 +1751,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
{ {
mergeInheritedAccessControlList(toInheritFrom, id); mergeInheritedAccessControlList(toInheritFrom, id);
} }
DirtySessionMethodInterceptor.flushSession(getSession(), true);
return id; return id;
case SHARED: case SHARED:
if (aclToInheritFrom != null) if (aclToInheritFrom != null)
@@ -1847,7 +1852,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
setAccessControlEntry(id, entry); setAccessControlEntry(id, entry);
} }
} }
DirtySessionMethodInterceptor.flushSession(getSession(), true);
return changes; return changes;
} }
@@ -2105,8 +2110,6 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
} }
/** /**
<<<<<<< .working
=======
* Get the total number of head nodes in the repository * Get the total number of head nodes in the repository
* *
* @return count * @return count
@@ -2138,7 +2141,6 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
} }
/** /**
>>>>>>> .merge-right.r17076
* Get the max acl id * Get the max acl id
* *
* @return - max acl id * @return - max acl id
@@ -2188,8 +2190,6 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
} }
/** /**
<<<<<<< .working
=======
* Get the acl count canges so far for progress tracking * Get the acl count canges so far for progress tracking
* *
* @param above * @param above
@@ -2222,7 +2222,6 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
} }
/** /**
>>>>>>> .merge-right.r17076
* How many nodes are noew in store (approximate) * How many nodes are noew in store (approximate)
* *
* @return - the number of new nodes - approximate * @return - the number of new nodes - approximate
@@ -2340,7 +2339,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
} }
/** /**
* Ho many DM nodes are there? * How many DM nodes are there?
* *
* @return - the count * @return - the count
*/ */
@@ -2410,6 +2409,7 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
{ {
dbAuthority.setAuthority(after); dbAuthority.setAuthority(after);
dbAuthority.setCrc(getCrc(after)); dbAuthority.setCrc(getCrc(after));
DirtySessionMethodInterceptor.flushSession(getSession(), true);
aclCache.clear(); aclCache.clear();
} }
} }