Author: nbelaevski Date: 2008-11-24 15:46:10 -0500 (Mon, 24 Nov 2008) New Revision: 11339 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java Log: QueueScript requested and encoded only if there are some queues Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-24 20:22:29 UTC (rev 11338) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-24 20:46:10 UTC (rev 11339) @@ -459,14 +459,18 @@ Map<String, Object> queues = QueueRegistry.getRegisteredQueues(context); if (Boolean.valueOf(getInitParameterValue(context, "org.richfaces.queue.global.enabled"))) { String encodedGlobalQueueName = context.getExternalContext().encodeNamespace(UIQueue.GLOBAL_QUEUE_NAME); - + + //TODO opimize this if (queues == null || !queues.containsKey(encodedGlobalQueueName)) { QueueRegistry.registerQueue(context, encodedGlobalQueueName, null); } } - InternetResource queueScriptResource = resourceBuilder.getResource(QUEUE_SCRIPT_RESOURCE); - queueScriptResource.encode(context, null); + queues = QueueRegistry.getRegisteredQueues(context); + if (queues != null && !queues.isEmpty()) { + InternetResource queueScriptResource = resourceBuilder.getResource(QUEUE_SCRIPT_RESOURCE); + queueScriptResource.encode(context, queues); + } // Append Skin StyleSheet after a if (null != skinStyleSheetUri) {