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

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

Author: remy.maucherat at jboss.com
Date: 2009-11-06 09:27:34 -0500 (Fri, 06 Nov 2009)
New Revision: 96098

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Oops, actually pass the right values.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-11-06 14:25:24 UTC (rev 96097)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-11-06 14:27:34 UTC (rev 96098)
@@ -1158,16 +1158,16 @@
                             servletSecurityAnnotation.getHttpMethodConstraints())
                          {
                             emptyRoleSemantic =  EmptyRoleSemantic.PERMIT;
-                            if (servletSecurityAnnotation.getEmptyRoleSemantic() != null)
+                            if (annotationMethodConstraint.getEmptyRoleSemantic() != null)
                             {
-                               emptyRoleSemantic = EmptyRoleSemantic.valueOf(servletSecurityAnnotation.getEmptyRoleSemantic().toString());
+                               emptyRoleSemantic = EmptyRoleSemantic.valueOf(annotationMethodConstraint.getEmptyRoleSemantic().toString());
                             }
                             transportGuarantee = TransportGuarantee.NONE;
-                            if (servletSecurityAnnotation.getTransportGuarantee() != null)
+                            if (annotationMethodConstraint.getTransportGuarantee() != null)
                             {
-                               transportGuarantee = TransportGuarantee.valueOf(servletSecurityAnnotation.getTransportGuarantee().toString());
+                               transportGuarantee = TransportGuarantee.valueOf(annotationMethodConstraint.getTransportGuarantee().toString());
                             }
-                            roleNames = servletSecurityAnnotation.getRolesAllowed().toArray(new String[0]);
+                            roleNames = annotationMethodConstraint.getRolesAllowed().toArray(new String[0]);
                             HttpConstraintElement constraint2 = 
                                new HttpConstraintElement(emptyRoleSemantic, transportGuarantee, roleNames);
                             HttpMethodConstraintElement methodConstraint =