Author: djencks
Date: Tue Dec 20 18:03:59 2011
New Revision: 1221382
URL: http://svn.apache.org/viewvc?rev=1221382&view=rev
Log:
GERONIMO-6240 R4.3 update
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java?rev=1221382&r1=1221381&r2=1221382&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
Tue Dec 20 18:03:59 2011
@@ -18,6 +18,7 @@
package org.apache.geronimo.transaction.wrapper.manager;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
@@ -110,7 +111,7 @@ public class GeronimoTransactionManagerG
clazzes.add(TransactionSynchronizationRegistry.class.getName());
clazzes.add(UserTransaction.class.getName());
clazzes.add(RecoverableTransactionManager.class.getName());
- serviceRegistration = bundleContext.registerService(clazzes.toArray(new String[clazzes.size()]),
this, new Properties());
+ serviceRegistration = bundleContext.registerService(clazzes.toArray(new String[clazzes.size()]),
this, new Hashtable<String, Object>());
}
public void doStop() throws Exception {
|