Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 25656 invoked from network); 20 May 2008 17:26:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 May 2008 17:26:17 -0000 Received: (qmail 3207 invoked by uid 500); 20 May 2008 17:26:17 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 3174 invoked by uid 500); 20 May 2008 17:26:17 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 3165 invoked by uid 99); 20 May 2008 17:26:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 10:26:17 -0700 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; Tue, 20 May 2008 17:25:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75F60238896C; Tue, 20 May 2008 10:25:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r658355 - in /commons/proper/chain/trunk: src/java/org/apache/commons/chain/web/portlet/ src/java/org/apache/commons/chain/web/servlet/ xdocs/ Date: Tue, 20 May 2008 17:25:52 -0000 To: commits@commons.apache.org From: niallp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080520172552.75F60238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: niallp Date: Tue May 20 10:25:51 2008 New Revision: 658355 URL: http://svn.apache.org/viewvc?rev=658355&view=rev Log: CHAIN-42 - Various scope mappers use incorrect equalization - thanks to Isaac Shabtay for the patch Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java commons/proper/chain/trunk/xdocs/changes.xml Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java Tue May 20 10:25:51 2008 @@ -68,7 +68,7 @@ Enumeration keys = context.getAttributeNames(); while (keys.hasMoreElements()) { Object next = context.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java Tue May 20 10:25:51 2008 @@ -68,7 +68,7 @@ Enumeration keys = request.getAttributeNames(); while (keys.hasMoreElements()) { Object next = request.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java Tue May 20 10:25:51 2008 @@ -78,7 +78,7 @@ session.getAttributeNames(PortletSession.PORTLET_SCOPE); while (keys.hasMoreElements()) { Object next = session.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java Tue May 20 10:25:51 2008 @@ -68,7 +68,7 @@ Enumeration keys = context.getAttributeNames(); while (keys.hasMoreElements()) { Object next = context.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java Tue May 20 10:25:51 2008 @@ -68,7 +68,7 @@ Enumeration keys = request.getAttributeNames(); while (keys.hasMoreElements()) { Object next = request.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java (original) +++ commons/proper/chain/trunk/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java Tue May 20 10:25:51 2008 @@ -77,7 +77,7 @@ Enumeration keys = session.getAttributeNames(); while (keys.hasMoreElements()) { Object next = session.getAttribute((String) keys.nextElement()); - if (next == value) { + if (value.equals(next)) { return (true); } } Modified: commons/proper/chain/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/xdocs/changes.xml?rev=658355&r1=658354&r2=658355&view=diff ============================================================================== --- commons/proper/chain/trunk/xdocs/changes.xml (original) +++ commons/proper/chain/trunk/xdocs/changes.xml Tue May 20 10:25:51 2008 @@ -40,6 +40,9 @@ + + Various scope mappers use incorrect equalization. + Upgrade to Commons Digester 1.8 to fix bug loading webapp resources.