[jboss-cvs] JBossAS SVN: r93023 - projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-08-31 08:05:40 -0400 (Mon, 31 Aug 2009)
New Revision: 93023

Modified:
   projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java
Log:
Workaround: Fix NPEs

Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java	2009-08-31 09:21:28 UTC (rev 93022)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java	2009-08-31 12:05:40 UTC (rev 93023)
@@ -226,7 +226,10 @@
 
       // Reauthentication support
       boolean reauthenticationSupport = c.reauthenticationSupport();
-      md.getRa().getOutboundRa().setReAuthSupport(reauthenticationSupport);
+      if (md.getRa() != null && md.getRa().getOutboundRa() != null)
+      {
+         md.getRa().getOutboundRa().setReAuthSupport(reauthenticationSupport);
+      }
 
       // RequiredWorkContext
       Class<? extends WorkContext>[] requiredWorkContexts = c.requiredWorkContexts();
@@ -310,18 +313,22 @@
 
       // Transaction support
       TransactionSupport.TransactionSupportLevel transactionSupport = c.transactionSupport();
-      if (transactionSupport.equals(TransactionSupportLevel.NoTransaction))
+      if (md.getRa() != null && md.getRa().getOutboundRa() != null)
       {
-         md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.NoTransaction);
+         if (transactionSupport.equals(TransactionSupportLevel.NoTransaction))
+         {
+            md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.NoTransaction);
+         }
+         else if (transactionSupport.equals(TransactionSupportLevel.XATransaction))
+         {
+            md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.XATransaction);
+         }
+         else if (transactionSupport.equals(TransactionSupportLevel.LocalTransaction))
+         {
+            md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.LocalTransaction);
+         }
       }
-      else if (transactionSupport.equals(TransactionSupportLevel.XATransaction))
-      {
-         md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.XATransaction);
-      }
-      else if (transactionSupport.equals(TransactionSupportLevel.LocalTransaction))
-      {
-         md.getRa().getOutboundRa().setTransSupport(TransactionSupportMetaData.LocalTransaction);
-      }
+
       // Vendor name
       String vendorName = c.vendorName();
       if (vendorName != null)