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

A rename and a minor code rearrangement.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-18 00:58:23 +00:00
parent 60cdda3f13
commit fff2fb6b05
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/avm-console-context.xml
View File

@@ -197,7 +197,8 @@
</bean> </bean>
<!-- The Hibernate Transaction wrapper. --> <!-- The Hibernate Transaction wrapper. -->
<bean id="retryingTransaction" class="org.alfresco.repo.avm.hibernate.HibernateTxn"> <bean id="retryingTransaction"
class="org.alfresco.repo.avm.hibernate.HibernateRetryingTransaction">
<property name="sessionFactory"> <property name="sessionFactory">
<ref bean="sessionFactory"/> <ref bean="sessionFactory"/>
</property> </property>

3
config/alfresco/avm-test-context.xml
View File

@@ -197,7 +197,8 @@
</bean> </bean>
<!-- The Hibernate Transaction wrapper. --> <!-- The Hibernate Transaction wrapper. -->
<bean id="retryingTransaction" class="org.alfresco.repo.avm.hibernate.HibernateTxn"> <bean id="retryingTransaction"
class="org.alfresco.repo.avm.hibernate.HibernateRetryingTransaction">
<property name="sessionFactory"> <property name="sessionFactory">
<ref bean="sessionFactory"/> <ref bean="sessionFactory"/>
</property> </property>

1
source/java/org/alfresco/repo/avm/AVMNodeDAO.java
View File

@@ -16,7 +16,6 @@
*/ */
package org.alfresco.repo.avm; package org.alfresco.repo.avm;
import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**

1
source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
View File

@@ -17,7 +17,6 @@
package org.alfresco.repo.avm.hibernate; package org.alfresco.repo.avm.hibernate;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.alfresco.repo.avm.AVMNode; import org.alfresco.repo.avm.AVMNode;

24
source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java → source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
View File

@@ -37,9 +37,9 @@ import org.springframework.transaction.TransactionStatus;
* Helper for DAOs. * Helper for DAOs.
* @author britt * @author britt
*/ */
public class HibernateTxn extends HibernateTemplate implements RetryingTransaction public class HibernateRetryingTransaction extends HibernateTemplate implements RetryingTransaction
{ {
private static Logger fgLogger = Logger.getLogger(HibernateTxn.class); private static Logger fgLogger = Logger.getLogger(HibernateRetryingTransaction.class);
/** /**
* The transaction manager. * The transaction manager.
*/ */
@@ -64,7 +64,7 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
* Make one up. * Make one up.
* @param sessionFactory The SessionFactory. * @param sessionFactory The SessionFactory.
*/ */
public HibernateTxn() public HibernateRetryingTransaction()
{ {
fRandom = new Random(); fRandom = new Random();
} }
@@ -82,15 +82,6 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
status = status =
fTransactionManager.getTransaction(write ? fWriteDefinition : fReadDefinition); fTransactionManager.getTransaction(write ? fWriteDefinition : fReadDefinition);
execute(new HibernateCallbackWrapper(callback)); execute(new HibernateCallbackWrapper(callback));
try
{
fTransactionManager.commit(status);
}
catch (TransactionException te)
{
throw new AVMException("Transaction Exception.", te);
}
return;
} }
catch (Throwable t) catch (Throwable t)
{ {
@@ -133,6 +124,15 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
} }
throw new AVMException("Unrecoverable error.", t); throw new AVMException("Unrecoverable error.", t);
} }
try
{
fTransactionManager.commit(status);
}
catch (TransactionException te)
{
throw new AVMException("Transaction Exception.", te);
}
return;
} }
} }