From 108840248ae6f18ef7e8f21134ac8eff8589ba57 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 29 Oct 2008 15:21:49 +0000 Subject: [PATCH] SWF-926 XmlFlowModelBuilder uses java 1.5 String.contains() method (not compatible with jre 1.4) removed call to java 5 method --- .../engine/model/builder/xml/XmlFlowModelBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java index b51d9aee..b3943780 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java @@ -650,12 +650,13 @@ public class XmlFlowModelBuilder implements FlowModelBuilder { String flowId; String stateId; AbstractStateModel parentState = null; - if (!parent.contains("#")) { + int hashIndex = parent.indexOf("#"); + if (hashIndex == -1) { throw new FlowModelBuilderException("Invalid parent syntax '" + parent + "', should take form 'flowId#stateId'"); } - flowId = parent.substring(0, parent.indexOf("#")).trim(); - stateId = parent.substring(parent.indexOf("#") + 1).trim(); + flowId = parent.substring(0, hashIndex).trim(); + stateId = parent.substring(hashIndex + 1).trim(); try { parentState = modelLocator.getFlowModel(flowId).getStateById(stateId); if (parentState == null) {