Author: kevan
Date: Wed Apr 18 16:04:19 2007
New Revision: 530195
URL: http://svn.apache.org/viewvc?view=rev&rev=530195
Log:
Need to associate connections, even if lazyConnect is enabled. Otherwise, if a Connection
is created and then a UserTransaction is begun, the Connection will not be enlisted in the
Transaction
Modified:
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java?view=diff&rev=530195&r1=530194&r2=530195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
Wed Apr 18 16:04:19 2007
@@ -81,7 +81,6 @@
}
private void associateConnections(ConnectorInstanceContext context) throws ResourceException
{
- if (!lazyConnect) {
Map connectionManagerToManagedConnectionInfoMap = context.getConnectionManagerMap();
for (Iterator i = connectionManagerToManagedConnectionInfoMap.entrySet().iterator();
i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
@@ -90,7 +89,6 @@
Set connections = (Set) entry.getValue();
mcci.enter(connections);
}
- }
}
public void newTransaction() throws ResourceException {
|