Return-Path: Mailing-List: contact turbine-maven-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list turbine-maven-dev@jakarta.apache.org Received: (qmail 1370 invoked by uid 97); 7 Dec 2002 23:25:10 -0000 Received: (qmail 1364 invoked by uid 98); 7 Dec 2002 23:25:09 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Received: (qmail 1345 invoked from network); 7 Dec 2002 23:25:07 -0000 Received: from daedalus.apache.org (HELO apache.org) (63.251.56.142) by nagoya.betaversion.org with SMTP; 7 Dec 2002 23:25:07 -0000 Received: (qmail 42159 invoked by uid 500); 7 Dec 2002 23:23:55 -0000 Received: (qmail 42152 invoked from network); 7 Dec 2002 23:23:55 -0000 Received: from icarus.apache.org (63.251.56.143) by daedalus.apache.org with SMTP; 7 Dec 2002 23:23:55 -0000 Received: (qmail 74555 invoked by uid 1162); 7 Dec 2002 23:23:54 -0000 Date: 7 Dec 2002 23:23:54 -0000 Message-ID: <20021207232354.74554.qmail@icarus.apache.org> From: jvanzyl@apache.org To: jakarta-turbine-maven-cvs@apache.org Subject: cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jelly MavenJellyContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jvanzyl 2002/12/07 15:23:54 Modified: src/java/org/apache/maven/jelly MavenJellyContext.java Log: o Correcting the behaviour of getBoolean. The key for the given property was being used as the value. Caught by the touchstone build attempt to use maven.jar.override. Revision Changes Path 1.20 +9 -7 jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenJellyContext.java Index: MavenJellyContext.java =================================================================== RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenJellyContext.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- MavenJellyContext.java 7 Dec 2002 02:19:08 -0000 1.19 +++ MavenJellyContext.java 7 Dec 2002 23:23:54 -0000 1.20 @@ -277,16 +277,18 @@ * Boolean based on its contents. It would be nice * if Jelly would deal with this automatically. * - * @param propValue The property value to convert. + * @param key The property key to lookup and convert. * * @return The boolean value of the property if convertiable, - * otherwise null. + * otherwise Boolean.FALSE. */ - public Boolean getBoolean( String propValue ) + public Boolean getBoolean( String key ) { - if ( "true".equalsIgnoreCase( propValue ) - || "on".equalsIgnoreCase( propValue ) - || "1".equals( propValue ) ) + String value = (String) getVariable( key ); + + if ( "true".equalsIgnoreCase( value ) + || "on".equalsIgnoreCase( value ) + || "1".equals( value ) ) { return Boolean.TRUE; }