Bug 438628 - [Backport] Ant properties cannot have values with comma
diff --git a/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF index a24ec20..815be9a 100644 --- a/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF +++ b/ant/org.eclipse.ant.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true -Bundle-Version: 3.2.401.qualifier +Bundle-Version: 3.2.402.qualifier Bundle-Activator: org.eclipse.ant.core.AntCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/ant/org.eclipse.ant.core/pom.xml b/ant/org.eclipse.ant.core/pom.xml index ae8abbc..18f5cbb 100644 --- a/ant/org.eclipse.ant.core/pom.xml +++ b/ant/org.eclipse.ant.core/pom.xml
@@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.ant</groupId> <artifactId>org.eclipse.ant.core</artifactId> - <version>3.2.401-SNAPSHOT</version> + <version>3.2.402-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java index ebe2bc6..ad15762 100644 --- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java +++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -378,13 +378,10 @@ Property[] result = new Property[properties.length]; for (int i = 0; i < properties.length; i++) { String propertyName = properties[i]; - String[] values = getArrayFromString(prefs.getString(IAntCoreConstants.PREFIX_PROPERTY + propertyName)); - if (values.length < 1) { - continue; - } + String value = prefs.getString(IAntCoreConstants.PREFIX_PROPERTY + propertyName); Property property = new Property(); property.setName(propertyName); - property.setValue(values[0]); + property.setValue(value); result[i]= property; } return result;