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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 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();
}
}