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 @@
   <body>
 
     <release version="1.2" date="in SVN">
+      <action dev="niallp" type="fix" issue="CHAIN-42" due-to="Isaac Shabtay">
+         Various scope mappers use incorrect equalization.
+      </action>
       <action dev="niallp" type="fix" issue="CHAIN-33">
          Upgrade to Commons Digester 1.8 to fix bug loading webapp resources.
       </action>


Reply via email to