You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/03/18 16:27:15 UTC
svn commit: r924861 - in /wicket/trunk:
wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
Author: ivaynberg
Date: Thu Mar 18 15:27:15 2010
New Revision: 924861
URL: http://svn.apache.org/viewvc?rev=924861&view=rev
Log:
Issue: WICKET-2787
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java?rev=924861&r1=924860&r2=924861&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/ValueMap.java Thu Mar 18 15:27:15 2010
@@ -606,6 +606,11 @@ public class ValueMap extends LinkedHash
*/
public boolean getAsBoolean(String key, boolean defaultValue)
{
+ if (!containsKey(key))
+ {
+ return defaultValue;
+ }
+
try
{
return getBoolean(key);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java?rev=924861&r1=924860&r2=924861&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/value/ValueMapTest.java Thu Mar 18 15:27:15 2010
@@ -196,6 +196,7 @@ public class ValueMapTest extends TestCa
assertEquals(defBoolean, vm.getAsBoolean("boolean.bad", defBoolean));
assertNull(vm.getAsBoolean("boolean.missing"));
assertEquals(defBoolean, vm.getAsBoolean("boolean.missing", defBoolean));
+ assertEquals(!defBoolean, vm.getAsBoolean("boolean.missing", !defBoolean));
// integer
assertEquals(integerValue, vm.getAsInteger("num"));