[jbossws-commits] JBossWS SVN: r15910 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-12 05:24:04 -0400 (Mon, 12 Mar 2012)
New Revision: 15910

Modified:
   shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
Only create securityDomains map for tests requiring security domain deployment


Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java	2012-03-12 09:22:42 UTC (rev 15909)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java	2012-03-12 09:24:04 UTC (rev 15910)
@@ -60,7 +60,7 @@
    private OutputStream appclientOutputStream;
    private String appclientArg;
    private ClassLoader originalClassLoader;
-   private Map<String, Map<String, String>> securityDomains = new HashMap<String, Map<String,String>>();
+   private Map<String, Map<String, String>> securityDomains;
    private boolean defaultSecurityDomainRequirement = false;
 
    public JBossWSTestSetup(Class<?> testClass, String archiveList)
@@ -137,7 +137,7 @@
       String integrationTarget = JBossWSTestHelper.getIntegrationTarget();
       log.debug("Integration target: " + integrationTarget);
       
-      if (!securityDomains.isEmpty())
+      if (securityDomains != null && !securityDomains.isEmpty())
       {
          for (String key : securityDomains.keySet())
          {
@@ -249,7 +249,7 @@
       {
          Thread.currentThread().setContextClassLoader(originalClassLoader);
          
-         if (!securityDomains.isEmpty())
+         if (securityDomains != null && !securityDomains.isEmpty())
          {
             for (String key : securityDomains.keySet())
             {
@@ -275,6 +275,9 @@
    
    public void addSecurityDomainRequirement(String securityDomainName, Map<String, String> authenticationOptions)
    {
+      if (securityDomains == null) {
+         securityDomains = new HashMap<String, Map<String,String>>();
+      }
       securityDomains.put(securityDomainName, authenticationOptions);
    }