You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2012/05/17 17:51:43 UTC
svn commit: r1339665 -
/aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Author: gnodet
Date: Thu May 17 15:51:42 2012
New Revision: 1339665
URL: http://svn.apache.org/viewvc?rev=1339665&view=rev
Log:
[ARIES-846] The Aries transaction manager does not recover transactions correctly
Modified:
aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Modified: aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
URL: http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java?rev=1339665&r1=1339664&r2=1339665&view=diff
==============================================================================
--- aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java (original)
+++ aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java Thu May 17 15:51:42 2012
@@ -16,29 +16,26 @@
*/
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.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;
/**
*/
@@ -127,10 +124,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);
}
@@ -151,9 +146,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());