Repository: deltaspike Updated Branches: refs/heads/master 5815ea366 -> d6923f276
DELTASPIKE-426 fallback for full state-saving Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/d6923f27 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/d6923f27 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/d6923f27 Branch: refs/heads/master Commit: d6923f2767e0feafe3c900c016769b1f8701a182 Parents: 5815ea3 Author: gpetracek <[email protected]> Authored: Wed Mar 12 09:13:47 2014 +0100 Committer: gpetracek <[email protected]> Committed: Wed Mar 12 09:13:47 2014 +0100 ---------------------------------------------------------------------- .../AbstractContextualReferenceWrapper.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/d6923f27/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/AbstractContextualReferenceWrapper.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/AbstractContextualReferenceWrapper.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/AbstractContextualReferenceWrapper.java index 49c8c0d..a60d1f6 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/AbstractContextualReferenceWrapper.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/AbstractContextualReferenceWrapper.java @@ -70,15 +70,16 @@ abstract class AbstractContextualReferenceWrapper<T> implements PartialStateHold @Override public Object saveState(FacesContext context) { + if (this.fullStateSavingFallbackEnabled == null) + { + this.fullStateSavingFallbackEnabled = + BeanProvider.getContextualReference(JsfModuleConfig.class).isFullStateSavingFallbackEnabled(); + } + if (this.wrapped instanceof StateHolder) { Object[] result = new Object[2]; - if (this.fullStateSavingFallbackEnabled == null) - { - this.fullStateSavingFallbackEnabled = - BeanProvider.getContextualReference(JsfModuleConfig.class).isFullStateSavingFallbackEnabled(); - } if (this.fullStateSavingFallbackEnabled) { result[0] = this.getWrapped().getClass().getName(); @@ -87,6 +88,13 @@ abstract class AbstractContextualReferenceWrapper<T> implements PartialStateHold return result; } + if (this.fullStateSavingFallbackEnabled) + { + Object[] result = new Object[1]; + result[0] = this.getWrapped().getClass().getName(); + + return result; + } return null; }
