change the reader to support null

1 files changed, 9 insertions, 2 deletions

diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/core/configurationManipulator/ConfigurationReader.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/core/configurationManipulator/ConfigurationReader.java
index af0422b01..658230a35 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/core/configurationManipulator/ConfigurationReader.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/core/configurationManipulator/ConfigurationReader.java
@@ -54,12 +54,19 @@ public class ConfigurationReader {
 			BufferedReader r = new BufferedReader(new InputStreamReader(new URL(configurationLocation,  CONFIG_LOCATION).openStream()));
 			String line;
 			while ( (line = r.readLine()) != null) {
-				StringTokenizer tok = new StringTokenizer(line, ",");
+				StringTokenizer tok = new StringTokenizer(line, ",", true);
 				BundleInfo bundle = new BundleInfo();
 				bundle.setSymbolicName(tok.nextToken());
+				tok.nextToken(); //,
 				bundle.setVersion(tok.nextToken());
-				bundle.setLocation(tok.nextToken());
+				tok.nextToken(); //,
+				String location = tok.nextToken();
+				if (! location.equals(",")) {
+					bundle.setLocation(location);
+					tok.nextToken(); //,
+				}
 				bundle.setStartLevel(Integer.parseInt(tok.nextToken().trim()));
+				tok.nextToken(); //,
 				bundle.setExpectedState(Integer.parseInt(tok.nextToken()));
 				
 				bundles.add(bundle);