Author: craigmcc Date: Mon Nov 14 17:41:32 2005 New Revision: 344286 URL: http://svn.apache.org/viewcvs?rev=344286&view=rev Log: [37476] Correct reserved view identifier (cookie, not cookies)
Had to correct the unit test as well. Submitted by: Rahul Akolkar (rahul AT apache.org) Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java struts/shale/trunk/core-library/src/test/org/apache/shale/view/impl/DefaultViewControllerMapperTestCase.java Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java?rev=344286&r1=344285&r2=344286&view=diff ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java Mon Nov 14 17:41:32 2005 @@ -65,7 +65,7 @@ static { reserved.add("applicationScope"); - reserved.add("cookies"); + reserved.add("cookie"); reserved.add("facesContext"); reserved.add("header"); reserved.add("headerValues"); Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/view/impl/DefaultViewControllerMapperTestCase.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/view/impl/DefaultViewControllerMapperTestCase.java?rev=344286&r1=344285&r2=344286&view=diff ============================================================================== --- struts/shale/trunk/core-library/src/test/org/apache/shale/view/impl/DefaultViewControllerMapperTestCase.java (original) +++ struts/shale/trunk/core-library/src/test/org/apache/shale/view/impl/DefaultViewControllerMapperTestCase.java Mon Nov 14 17:41:32 2005 @@ -74,7 +74,7 @@ // The set of reserved managed bean names that should be treated specially String reserved[] = { - "applicationScope", "cookies", "facesContext", "header", "headerValues", + "applicationScope", "cookie", "facesContext", "header", "headerValues", "initParam", "param", "paramValues", "requestScope", "sessionScope", "view", }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]