You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/03/11 01:30:02 UTC
svn commit: r1080407 - in /myfaces/core/branches/1.2.x/api/src:
main/java/javax/faces/component/UIViewRoot.java
test/java/javax/faces/component/UIViewRootTest.java
Author: lu4242
Date: Fri Mar 11 00:30:02 2011
New Revision: 1080407
URL: http://svn.apache.org/viewvc?rev=1080407&view=rev
Log:
MYFACES-3066 CLONE - UIView.createUniqueId shouldn't call encodeNameSpace to build the id (1.2.x branch).
Modified:
myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/component/UIViewRootTest.java
Modified: myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=1080407&r1=1080406&r2=1080407&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java Fri Mar 11 00:30:02 2011
@@ -201,11 +201,9 @@ public class UIViewRoot extends UICompon
*/
public String createUniqueId()
{
- ExternalContext extCtx = getFacesContext()
- .getExternalContext();
StringBuilder bld = __getSharedStringBuilder();
- return extCtx.encodeNamespace(bld.append(UNIQUE_ID_PREFIX).append(
- _uniqueIdCounter++).toString());
+ return bld.append(UNIQUE_ID_PREFIX).append(
+ _uniqueIdCounter++).toString();
}
/**
Modified: myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/component/UIViewRootTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/component/UIViewRootTest.java?rev=1080407&r1=1080406&r2=1080407&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/component/UIViewRootTest.java (original)
+++ myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/component/UIViewRootTest.java Fri Mar 11 00:30:02 2011
@@ -124,6 +124,7 @@ public class UIViewRootTest
@Test
public void testCreateUniqueId()
{
+ /*
expect(_externalContext.encodeNamespace((String) anyObject())).andAnswer(new IAnswer<String>()
{
public String answer() throws Throwable
@@ -131,6 +132,7 @@ public class UIViewRootTest
return (String) getCurrentArguments()[0];
}
}).anyTimes();
+ */
_mocksControl.replay();
Collection createdIds = new HashSet();
for (int i = 0; i < 10000; i++)