[jboss-cvs] JBossAS SVN: r67659 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: anil.saldhana at jboss.com
Date: 2007-11-30 14:32:35 -0500 (Fri, 30 Nov 2007)
New Revision: 67659

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
ensure security domain is trimmed

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-11-30 19:30:03 UTC (rev 67658)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-11-30 19:32:35 UTC (rev 67659)
@@ -316,10 +316,15 @@
          default:
             log.debug("Using session cookies default setting");
       }
+      
+      String metaDataSecurityDomain = metaData.getSecurityDomain();
+      if(metaDataSecurityDomain != null)
+         metaDataSecurityDomain = metaDataSecurityDomain.trim();
 
       //Add a valve to establish security context
-      SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaData.getSecurityDomain(), SecurityUtil.unprefixSecurityDomain(config
-            .getDefaultSecurityDomain()), config.getSecurityContextClassName(), config.getSecurityManagement());
+      SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaDataSecurityDomain, 
+            SecurityUtil.unprefixSecurityDomain(config.getDefaultSecurityDomain()), 
+            config.getSecurityContextClassName(), config.getSecurityManagement());
       context.addValve(scevalve);
 
       // Add a valve to estalish the JACC context before authorization valves