David,
This update is giving me a compile error on the latest trunk. The
OutboundResourceAdapter.isReauthenticationSupport() method returns null,
not a nullable object type. I checked against the latest from the
openejb project, that that still seems to be the case. Are you using a
different version of that class for your local builds?
Rick
On 3/31/2010 7:01 PM, [email protected] wrote:
Author: djencks
Date: Wed Mar 31 23:01:38 2010
New Revision: 929741
URL: http://svn.apache.org/viewvc?rev=929741&view=rev
Log:
GERONIMO-4360 glitch in merging annotations to ra.xml
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=929741&r1=929740&r2=929741&view=diff
==============================================================================
---
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Wed Mar 31 23:01:38 2010
@@ -653,7 +653,7 @@ public class ConnectorModuleBuilder impl
outboundResourceAdapter = new
OutboundResourceAdapter();
resourceAdapter.setOutboundResourceAdapter(outboundResourceAdapter);
}
- if (outboundResourceAdapter.isReauthenticationSupport()) {
+ if (outboundResourceAdapter.isReauthenticationSupport() ==
null) {
outboundResourceAdapter.setReauthenticationSupport(ra.reauthenticationSupport());
}
if (outboundResourceAdapter.getTransactionSupport() ==
null) {
