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 2012/08/23 13:03:03 UTC
git commit: WICKET-4723: fall back to
SUSPENDED_ATMOSPHERE_RESOURCE_UUID if UUID is missing
Updated Branches:
refs/heads/master 4da8399a6 -> ffa72a2dc
WICKET-4723: fall back to SUSPENDED_ATMOSPHERE_RESOURCE_UUID if UUID is missing
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffa72a2d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffa72a2d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffa72a2d
Branch: refs/heads/master
Commit: ffa72a2dcbe183825f768c585c61d1df840577ce
Parents: 4da8399
Author: Emond Papegaaij <pa...@apache.org>
Authored: Thu Aug 23 13:02:50 2012 +0200
Committer: Emond Papegaaij <pa...@apache.org>
Committed: Thu Aug 23 13:02:50 2012 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/AtmosphereBehavior.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ffa72a2d/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
index 3a46672..3f574bb 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
@@ -32,6 +32,7 @@ import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.resource.CoreLibrariesContributor;
+import org.atmosphere.cpr.ApplicationConfig;
import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereResourceEvent;
import org.atmosphere.cpr.AtmosphereResourceEventListener;
@@ -203,9 +204,15 @@ public class AtmosphereBehavior extends Behavior
*/
public static String getUUID(AtmosphereResource resource)
{
- String trackingId = resource.getRequest().getHeader(HeaderConfig.X_ATMOSPHERE_TRACKING_ID);
- if (trackingId != null)
- return trackingId;
+ Object trackingId = resource.getRequest().getHeader(HeaderConfig.X_ATMOSPHERE_TRACKING_ID);
+ if (trackingId != null && !trackingId.equals("0"))
+ return trackingId.toString();
+
+ trackingId = resource.getRequest().getAttribute(
+ ApplicationConfig.SUSPENDED_ATMOSPHERE_RESOURCE_UUID);
+ if (trackingId != null && !trackingId.equals("0"))
+ return trackingId.toString();
+
return resource.getRequest().getHeader("Sec-WebSocket-Key");
}
}
\ No newline at end of file