Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 3182 invoked from network); 18 Feb 2011 17:09:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2011 17:09:00 -0000 Received: (qmail 40690 invoked by uid 500); 18 Feb 2011 17:09:00 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 40582 invoked by uid 500); 18 Feb 2011 17:08:56 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 40574 invoked by uid 99); 18 Feb 2011 17:08:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 17:08:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 17:08:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 81E372388A4B; Fri, 18 Feb 2011 17:08:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1072066 - /felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java Date: Fri, 18 Feb 2011 17:08:32 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110218170832.81E372388A4B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Feb 18 17:08:32 2011 New Revision: 1072066 URL: http://svn.apache.org/viewvc?rev=1072066&view=rev Log: FELIX-2835 : SCR plugin: Parsing of "options" for property tag broken for javadoc annotations Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java?rev=1072066&r1=1072065&r2=1072066&view=diff ============================================================================== --- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java (original) +++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java Fri Feb 18 17:08:32 2011 @@ -169,12 +169,15 @@ public class PropertyHandler { if (Constants.PROPERTY_OPTIONS.equals(parameters[j])) { options = new LinkedHashMap(); } 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);