You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/08/04 09:15:32 UTC
[1/2] git commit: Make the check for empty property expression
stronger - it should trim the expression before checking for emptiness
Repository: wicket
Updated Branches:
refs/heads/master d558004bb -> ebd01006f
Make the check for empty property expression stronger - it should trim the expression before checking for emptiness
(cherry picked from commit 0639719c03a08071db21162238fda9d5f5001dc5)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/06913941
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/06913941
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/06913941
Branch: refs/heads/master
Commit: 069139412ce4b553375ac1a3006aaa9f5783091f
Parents: d558004
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Aug 4 09:11:12 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Aug 4 09:15:13 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/core/util/lang/PropertyResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/06913941/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
index b39d853..5b668c4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
@@ -127,7 +127,7 @@ public final class PropertyResolver
public static void setValue(final String expression, final Object object,
final Object value, final PropertyResolverConverter converter)
{
- if (expression == null || expression.equals(""))
+ if (Strings.isEmpty(expression))
{
throw new WicketRuntimeException("Empty expression setting value: " + value +
" on object: " + object);
[2/2] git commit: Remove a test that has been disabled long time ago.
Posted by mg...@apache.org.
Remove a test that has been disabled long time ago.
Its JDK1.5 version works as expected
(cherry picked from commit 176e2b4f6b2a4cf8310ff1894373e3da65d2bf23)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ebd01006
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ebd01006
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ebd01006
Branch: refs/heads/master
Commit: ebd01006f30442fe585a353ff43c3ff54dd7cd49
Parents: 0691394
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Aug 4 09:11:57 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Aug 4 09:15:25 2014 +0200
----------------------------------------------------------------------
.../apache/wicket/model/PropertyModelTest.java | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ebd01006/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
index e2c753b..2d3e039 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
@@ -121,24 +121,6 @@ public class PropertyModelTest extends WicketTestCase
}
/**
- * Tests setting a value on a {@link PropertyModel} when a final (constant!) property is
- * <code>null</code> and a concrete type. This should end in an exception because Wicket can't
- * assign to the property, since it is final.
- *
- * This test has been disabled as it doesn't work on Mac OS X's 1.4 jdk (assignment doesn't
- * fail).
- */
- @Test(expected = WicketRuntimeException.class)
- @Ignore
- public void setWithNullPathFinalJdk14()
- {
- Person person = new Person();
- PropertyModel<String> model = new PropertyModel<String>(person, "finalAddress.street");
- model.setObject("foo");
- fail("Expected exception");
- }
-
- /**
* Tests setting a value on a null, final property using a {@link PropertyModel}. This test
* should pass when run using JDK 1.5 or newer.
*/