You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/06/14 21:24:02 UTC
wicket git commit: added null check for
encodeResourceReferenceAttributes
Repository: wicket
Updated Branches:
refs/heads/WICKET-5906-7.x 926aa3729 -> 70d09656f
added null check for encodeResourceReferenceAttributes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/70d09656
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/70d09656
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/70d09656
Branch: refs/heads/WICKET-5906-7.x
Commit: 70d09656fb252e3881c8596c2e7b343262d5b9bc
Parents: 926aa37
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sun Jun 14 21:23:45 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sun Jun 14 21:23:45 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/resource/ResourceUtil.java | 3 +++
.../test/java/org/apache/wicket/resource/ResourceUtilTest.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/70d09656/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
index 6e55197..6c4458c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
@@ -150,6 +150,9 @@ public class ResourceUtil
*/
public static void encodeResourceReferenceAttributes(Url url, ResourceReference reference)
{
+ Args.notNull(url, "url");
+ Args.notNull(reference, "reference");
+
String encoded = encodeResourceReferenceAttributes(reference.getUrlAttributes());
if (!Strings.isEmpty(encoded))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/70d09656/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
index 74caa2c..e234195 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
@@ -100,6 +100,8 @@ public class ResourceUtilTest extends Assert
public void encodeResourceReferenceAttributesWithResource() throws Exception
{
ResourceReference resourceReference = Mockito.mock(ResourceReference.class);
+
+ //test with all null attributes
UrlAttributes attributes = new UrlAttributes(null, null, null);
String urlString = "www.funny.url";
@@ -108,7 +110,6 @@ public class ResourceUtilTest extends Assert
Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
- //test with all null attributes
assertEquals(urlString, url.toString());
Mockito.reset(resourceReference);