Author: nbelaevski Date: 2010-09-18 21:21:32 -0400 (Sat, 18 Sep 2010) New Revision: 19259 Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/ClientBehavior.java Log: https://jira.jboss.org/browse/RF-9351 Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/ClientBehavior.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/ClientBehavior.java 2010-09-19 00:41:18 UTC (rev 19258) +++ trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/ClientBehavior.java 2010-09-19 01:21:32 UTC (rev 19259) @@ -138,7 +138,7 @@ if (stateObject.length == 3) { getStateHelper().restoreState(context, stateObject[1]); - restoreBindings(context, stateObject[2]); + this.bindings = restoreBindings(context, stateObject[2]); clearInitialState(); } @@ -167,7 +167,6 @@ // Utility for restoring bindings from state private static Map<String, ValueExpression> restoreBindings(FacesContext context, Object state) { - if (state == null) { return (null); } @@ -175,7 +174,7 @@ Object[] values = (Object[]) state; String[] names = (String[]) values[0]; Object[] states = (Object[]) values[1]; - Map<String, ValueExpression> bindings = new HashMap<String, ValueExpression>(names.length); + Map<String, ValueExpression> bindings = new HashMap<String, ValueExpression>(); for (int i = 0; i < names.length; i++) { bindings.put(names[i], (ValueExpression) UIComponentBase.restoreAttachedState(context, states[i])); }