svn commit: r594344 - /myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java

[jw...@apache.org]

Author: jwaldman
Date: Mon Nov 12 15:23:52 2007
New Revision: 594344

URL: http://svn.apache.org/viewvc?rev=594344&view=rev
Log:
TRINIDAD-804 Unnecessary call to get/setRowKey in addPartialTarget

Modified:
    myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java

Modified: myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=594344&r1=594343&r2=594344&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ myfaces/trinidad/branches/1.2.4-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Mon Nov 12 15:23:52 2007
@@ -471,24 +471,7 @@
 
     // find the nearest ancestor that generates html markup:
     newTarget = _getNearestPPRTarget(newTarget);
-
-    Object savedKey = null;
-    // =-=AEW Force the rowkey of a collection back to null so that the clientId
-    // will be correct.  Note that in JSF 1.2, this will be unnecessary
-    if (newTarget instanceof UIXCollection)
-    {
-      savedKey = ((UIXCollection) newTarget).getRowKey();
-      if (savedKey != null)
-        ((UIXCollection) newTarget).setRowKey(null);
-    }
-
     String clientId = newTarget.getClientId(fContext);
-
-    // Restore the row key
-    if (savedKey != null)
-    {
-      ((UIXCollection) newTarget).setRowKey(savedKey);
-    }
 
     _LOG.finer("Adding partial target: {0}", newTarget);