From scm-return-44325-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Oct 20 11:56:33 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 6849 invoked from network); 20 Oct 2010 11:56:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Oct 2010 11:56:33 -0000 Received: (qmail 90581 invoked by uid 500); 20 Oct 2010 11:56:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 90522 invoked by uid 500); 20 Oct 2010 11:56:31 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 90515 invoked by uid 99); 20 Oct 2010 11:56:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 11:56:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 11:56:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 411BD2388A39; Wed, 20 Oct 2010 11:55:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1025519 - /geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java Date: Wed, 20 Oct 2010 11:55:32 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101020115532.411BD2388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: genspring Date: Wed Oct 20 11:55:31 2010 New Revision: 1025519 URL: http://svn.apache.org/viewvc?rev=1025519&view=rev Log: Somehow, once currentRolePatterns = new HashMap(); is executed.currentPatterns will point to the same reference of currentRolePatterns. Pull (currentPatterns ==null) out of the loop to avoid the unexpected logic caused by the problem above. Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java?rev=1025519&r1=1025518&r2=1025519&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/security/SpecSecurityBuilder.java Wed Oct 20 11:55:31 2010 @@ -108,10 +108,13 @@ public class SpecSecurityBuilder { currentPatterns = uncheckedPatterns; } String transport = securityConstraint.userDataConstraint == null ? "NONE" : securityConstraint.userDataConstraint; + + boolean isRolebasedPatten = (currentPatterns == null); + for (WebResourceCollectionInfo webResourceCollection : securityConstraint.webResourceCollections) { //Calculate HTTP methods list for (String urlPattern : webResourceCollection.urlPatterns) { - if (currentPatterns == null) { + if (isRolebasedPatten) { for (String roleName : roleNames) { Map currentRolePatterns = rolesPatterns.get(roleName); if (currentRolePatterns == null) {