diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java index d28e88c6..7548ccc1 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java @@ -45,7 +45,7 @@ public class AjaxEventInterceptorRenderer extends DojoDecorationRenderer { ResponseWriter writer = context.getResponseWriter(); String processIds = (String) component.getAttributes().get("processIds"); - if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) { + if (StringUtils.hasText(processIds) && processIds.indexOf(component.getClientId(context)) == -1) { processIds = component.getClientId(context) + ", " + processIds; } else if (!StringUtils.hasText(processIds)) { processIds = component.getClientId(context); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java index 2cfdd69e..9be912df 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java @@ -161,7 +161,7 @@ public class AjaxViewRoot extends DelegatingViewRoot { FacesContext context = FacesContext.getCurrentInstance(); String processIdsParam = (String) context.getExternalContext().getRequestParameterMap().get( PROCESS_IDS_PARAM); - if (StringUtils.hasText(processIdsParam) && processIdsParam.contains(PROCESS_ALL)) { + if (StringUtils.hasText(processIdsParam) && processIdsParam.indexOf(PROCESS_ALL) != -1) { processIds = new String[] { getOriginalViewRoot().getClientId(context) }; } else { processIds = StringUtils.delimitedListToStringArray(processIdsParam, ",", " "); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java index 7ea15b1d..097b5e81 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java @@ -77,7 +77,7 @@ public class ProgressiveCommandButtonRenderer extends BaseDojoComponentRenderer Boolean ajaxEnabled = (Boolean) component.getAttributes().get("ajaxEnabled"); String processIds = (String) component.getAttributes().get("processIds"); if (Boolean.TRUE.equals(ajaxEnabled)) { - if (StringUtils.hasText(processIds) && !processIds.contains(component.getClientId(context))) { + if (StringUtils.hasText(processIds) && processIds.indexOf(component.getClientId(context)) == -1) { processIds = component.getClientId(context) + ", " + processIds; } else if (!StringUtils.hasText(processIds)) { processIds = component.getClientId(context); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java index 6f54f097..6e421747 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java @@ -106,7 +106,8 @@ public class FlowDefinitionResourceFactory { try { resource = resourceLoader.getResource(basePath).createRelative(path); } catch (IOException e) { - throw new IllegalStateException("The base path cannot be resolved from '" + basePath + "'", e); + throw new IllegalStateException("The base path cannot be resolved from '" + basePath + "': " + + e.getMessage()); } } if (flowId == null || flowId.length() == 0) {