[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment ContainerSecurityBuilder.java

[djencks]

djencks     2005/06/14 14:43:29

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        ContainerSecurityBuilder.java
  Log:

  minor code cleanup
  
  Revision  Changes    Path
  1.17      +2 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java
  
  Index: ContainerSecurityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ContainerSecurityBuilder.java     5 May 2005 21:06:39 -0000       1.16
  +++ ContainerSecurityBuilder.java     14 Jun 2005 18:43:29 -0000      1.17
  @@ -76,9 +76,9 @@
           builder.setSecurityEnabled(true);
           
builder.setDoAsCurrentCaller(securityConfiguration.isDoAsCurrentCaller());
           
builder.setUseContextHandler(securityConfiguration.isUseContextHandler());
  -        boolean needsRunAs = (securityIdentity != null && 
securityIdentity.getRunAs() != null);
  +        boolean needsRunAs = (securityIdentity != null && 
securityIdentity.isSetRunAs());
           if (needsRunAs) {
  -            String runAsName = (needsRunAs ? 
securityIdentity.getRunAs().getRoleName().getStringValue() : "");
  +            String runAsName = 
securityIdentity.getRunAs().getRoleName().getStringValue().trim();
               Subject roleDesignate = (Subject) 
securityConfiguration.getRoleDesignates().get(runAsName);
               if (roleDesignate == null) {
                   throw new DeploymentException("No role designate found for 
run-as name: " + runAsName);