Author: amarkhel Date: 2010-09-27 15:27:49 -0400 (Mon, 27 Sep 2010) New Revision: 19349 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java Log: RF-9328 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -81,6 +81,14 @@ } public boolean hasQueuesToEncode() { - return !queuesData.isEmpty(); + if (queuesData.isEmpty()) { + return false; + } + for (Map.Entry<String, UIComponent> queue : queuesData.entrySet()) { + if (queue.getValue().isRendered()) { + return true; + } + } + return false; } } \ No newline at end of file Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -89,9 +89,6 @@ } UIComponent comp = event.getComponent(); - if (!comp.isRendered()) { - return; - } String queueName = getQueueName(context, comp); QueueRegistry queueRegistry = QueueRegistry.getInstance(context); Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -93,6 +93,9 @@ boolean isFirst = true; Map<String, UIComponent> registeredQueues = registry.getRegisteredQueues(); for (Entry<String, UIComponent> queueEntry : registeredQueues.entrySet()) { + if (!queueEntry.getValue().isRendered()) { + break; + } if (isFirst) { isFirst = false; } else {