[jboss-cvs] JBossAS SVN: r110806 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: fungal and 1 other directory.

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

Author: jesper.pedersen
Date: 2011-03-01 08:37:03 -0500 (Tue, 01 Mar 2011)
New Revision: 110806

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
Log:
Null / empty must be supported for getSubjectFactory()

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-03-01 13:27:39 UTC (rev 110805)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-03-01 13:37:03 UTC (rev 110806)
@@ -1579,7 +1579,7 @@
    /**
     * Get a subject factory
     * @param securityDomain The security domain
-    * @return The subject factory
+    * @return The subject factory; must return <code>null</code> if security domain isn't defined
     * @exception DeployException Thrown if the security domain can't be resolved
     */
    protected abstract SubjectFactory getSubjectFactory(String securityDomain) throws DeployException;

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2011-03-01 13:27:39 UTC (rev 110805)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2011-03-01 13:37:03 UTC (rev 110806)
@@ -474,12 +474,9 @@
    @Override
    protected SubjectFactory getSubjectFactory(String securityDomain) throws DeployException
    {
-      if (securityDomain == null)
-         throw new IllegalArgumentException("SecurityDomain is null");
+      if (securityDomain == null || securityDomain.trim().equals(""))
+         return null;
 
-      if (securityDomain.trim().equals(""))
-         throw new IllegalArgumentException("SecurityDomain is empty");
-
       try
       {
          return kernel.getBean(securityDomain, SubjectFactory.class);