FELIX-2835 : SCR plugin: Parsing of "options" for property tag broken for javadoc annotations
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1072066 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
index 88d81de..cfae583 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
@@ -169,12 +169,15 @@
if (Constants.PROPERTY_OPTIONS.equals(parameters[j])) {
options = new LinkedHashMap<String, String>();
} else if (options != null) {
- String optionLabel = parameters[j];
- String optionValue = (j < parameters.length-2) ? parameters[j+2] : null;
- if (optionValue != null) {
- options.put(optionLabel, optionValue);
+ final String option = parameters[j];
+ final int pos = option.indexOf('=');
+ if ( pos != -1 ) {
+ String optionLabel = option.substring(0, pos);
+ String optionValue = option.substring(pos + 1);
+ if (optionValue != null && optionValue.length() > 0 ) {
+ options.put(optionLabel, optionValue);
+ }
}
- j += 2;
}
}
ad.setOptions(options);