You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by em...@apache.org on 2018/01/16 18:36:39 UTC
svn commit: r1821282 - in /myfaces/core/branches/2.3.x:
api/src/main/java/javax/faces/component/UIComponentBase.java
api/src/main/java/javax/faces/component/UIData.java
impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
Author: embreijo
Date: Tue Jan 16 18:36:39 2018
New Revision: 1821282
URL: http://svn.apache.org/viewvc?rev=1821282&view=rev
Log:
MYFACES-4188 Forward port changes in MYFACES-4048 to JSF 2.3
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=1821282&r1=1821281&r2=1821282&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIComponentBase.java Tue Jan 16 18:36:39 2018
@@ -1985,7 +1985,8 @@ public abstract class UIComponentBase ex
}
Object transientState = null;
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
transientState = saveTransientState(context);
}
@@ -2036,7 +2037,8 @@ public abstract class UIComponentBase ex
values[6] = _markCreated;
values[7] = _rendererType;
values[8] = _capabilities;
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
values[9] = saveTransientState(context);
}
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIData.java?rev=1821282&r1=1821281&r2=1821282&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/UIData.java Tue Jan 16 18:36:39 2018
@@ -1556,7 +1556,8 @@ public class UIData extends UIComponentB
if (initialStateMarked())
{
Object parentSaved = super.saveState(context);
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
if (parentSaved == null &&_rowDeltaStates.isEmpty() && _rowStates.isEmpty())
{
@@ -1589,7 +1590,8 @@ public class UIData extends UIComponentB
}
else
{
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
Object values[] = new Object[4];
values[0] = super.saveState(context);
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java?rev=1821282&r1=1821281&r2=1821282&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java Tue Jan 16 18:36:39 2018
@@ -1686,7 +1686,8 @@ public class UIRepeat extends UIComponen
if (initialStateMarked())
{
Object parentSaved = super.saveState(context);
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
if (parentSaved == null /*&&_rowDeltaStates.isEmpty()*/ && _rowStates.isEmpty())
{
@@ -1720,7 +1721,8 @@ public class UIRepeat extends UIComponen
}
else
{
- if (!context.getCurrentPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ if (context.getCurrentPhaseId() != null &&
+ !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
Object values[] = new Object[3];
values[0] = super.saveState(context);