aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1341252 - /aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Date Mon, 21 May 2012 22:58:53 GMT
Author: gnodet
Date: Mon May 21 22:58:53 2012
New Revision: 1341252

URL: http://svn.apache.org/viewvc?rev=1341252&view=rev
Log:
[ARIES-846] The Aries transaction manager does not recover transactions correctly


Conflicts:

	transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java

Modified:
    aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java

Modified: aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java?rev=1341252&r1=1341251&r2=1341252&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
(original)
+++ aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Mon May 21 22:58:53 2012
@@ -16,30 +16,30 @@
  */
 package org.apache.aries.transaction;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Properties;
-import java.io.File;
-import java.io.IOException;
-
-import javax.transaction.xa.XAException;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
+import javax.transaction.xa.XAException;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 import org.apache.aries.util.AriesFrameworkUtil;
+import org.apache.geronimo.transaction.log.HOWLLog;
+import org.apache.geronimo.transaction.log.UnrecoverableLog;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
 import org.apache.geronimo.transaction.manager.TransactionLog;
 import org.apache.geronimo.transaction.manager.XidFactory;
 import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
-import org.apache.geronimo.transaction.log.HOWLLog;
-import org.apache.geronimo.transaction.log.UnrecoverableLog;
-import org.objectweb.howl.log.LogConfigurationException;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.ConfigurationException;
 
 /**
  */
@@ -128,10 +128,8 @@ public class TransactionManagerService {
                                              threadsWaitingForceThreshold,
                                              xidFactory != null ? xidFactory : new XidFactoryImpl(),
                                              null);
-            } catch (LogConfigurationException e) {
-                // This should not really happen as we've checked properties earlier
-                throw new ConfigurationException(null, null, e);
-            } catch (IOException e) {
+                ((HOWLLog) transactionLog).doStart();
+            } catch (Exception e) {
                 // This should not really happen as we've checked properties earlier
                 throw new ConfigurationException(null, null, e);
             }
@@ -152,9 +150,6 @@ public class TransactionManagerService {
     }
 
     public void start() throws Exception {
-        if (transactionLog instanceof HOWLLog) {
-            ((HOWLLog) transactionLog).doStart();
-        }
         List<String> clazzes = new ArrayList<String>();
         clazzes.add(TransactionManager.class.getName());
         clazzes.add(TransactionSynchronizationRegistry.class.getName());



Mime
View raw message