Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent 91eb2644ad
commit 12769c2923
830 changed files with 142534 additions and 142534 deletions

View File

@@ -1,67 +1,67 @@
package org.alfresco.repo.transaction;
/* package scope */ class DAOAdapter implements TransactionListener
{
protected TransactionalDao daoService;
public DAOAdapter (TransactionalDao daoService)
{
this.daoService = daoService;
}
@Override
public void flush()
{
// NO-OP
}
@Override
public void beforeCommit(boolean readOnly)
{
daoService.beforeCommit(readOnly);
}
@Override
public void beforeCompletion()
{
// NO-OP
}
@Override
public void afterCommit()
{
// NO-OP
}
@Override
public void afterRollback()
{
// NO-OP
}
public TransactionalDao getService()
{
return daoService;
}
public boolean equals(Object obj)
{
if(obj instanceof DAOAdapter)
{
DAOAdapter other = (DAOAdapter)obj;
return daoService.equals(other.daoService);
}
return daoService.equals(obj);
}
/**
* Return a hashcode for the request
*
* @return int
*/
public int hashCode()
{
return daoService.hashCode();
}
}
package org.alfresco.repo.transaction;
/* package scope */ class DAOAdapter implements TransactionListener
{
protected TransactionalDao daoService;
public DAOAdapter (TransactionalDao daoService)
{
this.daoService = daoService;
}
@Override
public void flush()
{
// NO-OP
}
@Override
public void beforeCommit(boolean readOnly)
{
daoService.beforeCommit(readOnly);
}
@Override
public void beforeCompletion()
{
// NO-OP
}
@Override
public void afterCommit()
{
// NO-OP
}
@Override
public void afterRollback()
{
// NO-OP
}
public TransactionalDao getService()
{
return daoService;
}
public boolean equals(Object obj)
{
if(obj instanceof DAOAdapter)
{
DAOAdapter other = (DAOAdapter)obj;
return daoService.equals(other.daoService);
}
return daoService.equals(obj);
}
/**
* Return a hashcode for the request
*
* @return int
*/
public int hashCode()
{
return daoService.hashCode();
}
}