Repository: deltaspike Updated Branches: refs/heads/master 73d63256a -> 550a2cd23
DELTASPIKE-584 ds:disableClientWindow prevents child rendering with CLIENTWINDOW mode Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/550a2cd2 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/550a2cd2 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/550a2cd2 Branch: refs/heads/master Commit: 550a2cd2379d38ef5349246a5bec2d4f0c1656f3 Parents: 73d6325 Author: tandraschko <[email protected]> Authored: Sun Apr 27 22:35:35 2014 +0200 Committer: tandraschko <[email protected]> Committed: Sun Apr 27 22:35:35 2014 +0200 ---------------------------------------------------------------------- .../window/DisableClientWindowHtmlRenderer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/550a2cd2/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/DisableClientWindowHtmlRenderer.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/DisableClientWindowHtmlRenderer.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/DisableClientWindowHtmlRenderer.java index efd3cdc..f79da69 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/DisableClientWindowHtmlRenderer.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/DisableClientWindowHtmlRenderer.java @@ -35,17 +35,17 @@ public class DisableClientWindowHtmlRenderer extends Renderer @Override public void encodeChildren(FacesContext context, UIComponent component) throws IOException { - boolean isEnabled = getClientWindow().isClientWindowRenderModeEnabled(context); - - if (isEnabled) + boolean clientWindowRenderModeEnabled = getClientWindow().isClientWindowRenderModeEnabled(context); + + try { - try - { - getClientWindow().disableClientWindowRenderMode(context); + getClientWindow().disableClientWindowRenderMode(context); - super.encodeChildren(context, component); - } - finally + super.encodeChildren(context, component); + } + finally + { + if (clientWindowRenderModeEnabled) { getClientWindow().enableClientWindowRenderMode(context); }
