You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/03/08 16:17:00 UTC

git commit: WICKET-5084: temp fix for NPE when rendering urls

Updated Branches:
  refs/heads/master 581c73069 -> ddfef631e


WICKET-5084: temp fix for NPE when rendering urls


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ddfef631
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ddfef631
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ddfef631

Branch: refs/heads/master
Commit: ddfef631e242f303c52b6990ee607e0b262bbe14
Parents: 581c730
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Mar 8 15:59:31 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Mar 8 15:59:48 2013 +0100

----------------------------------------------------------------------
 .../wicket/atmosphere/AtmosphereWebResponse.java   |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ddfef631/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java
index c6b57d5..6a86e97 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java
@@ -102,7 +102,8 @@ class AtmosphereWebResponse extends WebResponse
 	@Override
 	public String encodeRedirectURL(CharSequence url)
 	{
-		return response.encodeRedirectUrl(url.toString());
+		// TODO temp fix for https://github.com/Atmosphere/atmosphere/issues/949
+		return url.toString();
 	}
 
 	@Override
@@ -128,7 +129,8 @@ class AtmosphereWebResponse extends WebResponse
 	@Override
 	public String encodeURL(CharSequence url)
 	{
-		return response.encodeURL(url.toString());
+		// TODO temp fix for https://github.com/Atmosphere/atmosphere/issues/949
+		return url.toString();
 	}
 
 	@Override