From fff2fb6b05bd8466df494fed05790d1bda6b4fe1 Mon Sep 17 00:00:00 2001
From: Britt Park <britt.park@alfresco.com>
Date: Tue, 18 Jul 2006 00:58:23 +0000
Subject: [PATCH] A rename and a minor code rearrangement.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/avm-console-context.xml       |  3 ++-
 config/alfresco/avm-test-context.xml          |  3 ++-
 .../org/alfresco/repo/avm/AVMNodeDAO.java     |  1 -
 .../avm/hibernate/AVMNodeDAOHibernate.java    |  1 -
 ...java => HibernateRetryingTransaction.java} | 24 +++++++++----------
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename source/java/org/alfresco/repo/avm/hibernate/{HibernateTxn.java => HibernateRetryingTransaction.java} (90%)

diff --git a/config/alfresco/avm-console-context.xml b/config/alfresco/avm-console-context.xml
index eb47bcada1..2b803a3110 100644
--- a/config/alfresco/avm-console-context.xml
+++ b/config/alfresco/avm-console-context.xml
@@ -197,7 +197,8 @@
 	</bean>
 
 	<!-- 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">
 			<ref bean="sessionFactory"/>
 		</property>
diff --git a/config/alfresco/avm-test-context.xml b/config/alfresco/avm-test-context.xml
index b939b9ead2..e41b7252e7 100644
--- a/config/alfresco/avm-test-context.xml
+++ b/config/alfresco/avm-test-context.xml
@@ -197,7 +197,8 @@
 	</bean>
 
 	<!-- 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">
 			<ref bean="sessionFactory"/>
 		</property>
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDAO.java b/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
index a1b9ee671d..8aa3b49bc8 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
@@ -16,7 +16,6 @@
  */
 package org.alfresco.repo.avm;
 
-import java.util.Iterator;
 import java.util.List;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
index ffb59c222a..77fa28b9f4 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
@@ -17,7 +17,6 @@
 
 package org.alfresco.repo.avm.hibernate;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.alfresco.repo.avm.AVMNode;
diff --git a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java b/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
similarity index 90%
rename from source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java
rename to source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
index 242a58c28a..efa140e5ed 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
@@ -37,9 +37,9 @@ import org.springframework.transaction.TransactionStatus;
  * Helper for DAOs.
  * @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.
      */
@@ -64,7 +64,7 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
      * Make one up.
      * @param sessionFactory The SessionFactory.
      */
-    public HibernateTxn()
+    public HibernateRetryingTransaction()
     {
         fRandom = new Random();
     }
@@ -82,15 +82,6 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
                 status = 
                     fTransactionManager.getTransaction(write ? fWriteDefinition : fReadDefinition);
                 execute(new HibernateCallbackWrapper(callback));
-                try
-                {
-                    fTransactionManager.commit(status);
-                }
-                catch (TransactionException te)
-                {
-                    throw new AVMException("Transaction Exception.", te);
-                }
-                return;
             }
             catch (Throwable t)
             {
@@ -133,6 +124,15 @@ public class HibernateTxn extends HibernateTemplate implements RetryingTransacti
                 }
                 throw new AVMException("Unrecoverable error.", t);
             }
+            try
+            {
+                fTransactionManager.commit(status);
+            }
+            catch (TransactionException te)
+            {
+                throw new AVMException("Transaction Exception.", te);
+            }
+            return;
         }
     }