Author: amarkhel Date: 2009-05-28 08:40:55 -0400 (Thu, 28 May 2009) New Revision: 14390 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java Log: Fix RF-7181 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-05-28 12:40:25 UTC (rev 14389) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-05-28 12:40:55 UTC (rev 14390) @@ -71,7 +71,7 @@ private static final Log log = LogFactory.getLog(AjaxContext.class); - Set<String> ajaxAreasToRender = new HashSet<String>(); + Set<String> ajaxAreasToRender = new LinkedHashSet<String>(); Set<String> ajaxAreasToProcess = null; @@ -100,7 +100,7 @@ public void release() { - ajaxAreasToRender = new HashSet<String>(); + ajaxAreasToRender = new LinkedHashSet<String>(); ajaxAreasToProcess = null; Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-05-28 12:40:25 UTC (rev 14389) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-05-28 12:40:55 UTC (rev 14390) @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -540,24 +541,24 @@ if (null != valueToSet) { // Simplest case - set. if (valueToSet instanceof Set) { - return (Set<String>) valueToSet; + return new LinkedHashSet<String>((Set<String>)valueToSet); } // Other collections. else if (valueToSet instanceof Collection) { - return new HashSet<String>((Collection<String>) valueToSet); + return new LinkedHashSet<String>((Collection<String>) valueToSet); } // Array else if (OBJECT_ARRAY_CLASS.isAssignableFrom(valueToSet.getClass())) { - return new HashSet<String>(Arrays.asList((String[]) valueToSet)); + return new LinkedHashSet<String>(Arrays.asList((String[]) valueToSet)); } // Tokenize string. else if (valueToSet instanceof String) { String areasString = (String) valueToSet; if (areasString.indexOf(",") > 0) { - return new HashSet<String>(Arrays.asList(areasString.trim().split( + return new LinkedHashSet<String>(Arrays.asList(areasString.trim().split( "(\\s)*,(\\s)*"))); } else { - Set<String> areasSet = new HashSet<String>(5); + Set<String> areasSet = new LinkedHashSet<String>(5); areasSet.add(areasString.trim()); return areasSet; }