Fixing a problem with how we parse version strings.

1 files changed, 7 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java
index 88718f494..3291b78c0 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java
@@ -157,16 +157,15 @@ public class FileUtils {
 		if (filename.indexOf("/") != -1)
 			filename = filename.substring(filename.lastIndexOf("/") + 1);
 		//System.out.println("filename=" + filename);
-		if (filename.lastIndexOf("_") == -1)
-			return null;
-		String version = filename.substring(filename.lastIndexOf("_") + 1);
-		filename = filename.substring(0, filename.lastIndexOf("_"));
-		//System.out.println("filename=" + filename);
-		if (filename.indexOf("_") != -1)
+		
+		if (! filename.startsWith(pluginName))
 			return null;
-		if (!filename.equals(pluginName))
+		
+		int pluginnameLength = pluginName.length();
+		if (filename.length() <= pluginnameLength || filename.charAt(pluginName.length()) != '_')
 			return null;
-		return version;
+		
+		return filename.substring(pluginnameLength + 1);	
 	}
 
 	public static String getEclipsePluginFullLocation(String pluginName, File bundlesDir) {