From 8166ef71e119c10fff60131fbd170d9fb59a2113 Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Tue, 16 Dec 2008 22:15:20 +0000
Subject: [PATCH] SWF-998 FlowDefinitionResourceFactory.getFlowId does not
 remove the classpath scheme if the resource implements ContextResource

---
 .../webflow/config/FlowDefinitionResourceFactory.java        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 71cc0764..69bac45a 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
@@ -193,18 +193,15 @@ public class FlowDefinitionResourceFactory {
 		if (basePath == null) {
 			return getFlowIdFromFileName(flowResource);
 		}
-		String basePath = this.basePath;
+		String basePath = removeClasspathScheme(this.basePath);
 		String filePath;
 		if (flowResource instanceof ContextResource) {
 			filePath = ((ContextResource) flowResource).getPathWithinContext();
 		} else if (flowResource instanceof ClassPathResource) {
-			basePath = removeClasspathScheme(basePath);
 			filePath = ((ClassPathResource) flowResource).getPath();
 		} else if (flowResource instanceof FileSystemResource) {
-			basePath = removeClasspathScheme(basePath);
 			filePath = truncateFilePath(((FileSystemResource) flowResource).getPath(), basePath);
 		} else if (flowResource instanceof UrlResource) {
-			basePath = removeClasspathScheme(basePath);
 			try {
 				filePath = truncateFilePath(((UrlResource) flowResource).getURL().getPath(), basePath);
 			} catch (IOException e) {