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/12 12:34:54 UTC
git commit: Minor cleanup in AtmosphereBehavior
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 6ce317cf9 -> 353aa4e8b
Minor cleanup in AtmosphereBehavior
Cache call results if they are used more than once
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/353aa4e8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/353aa4e8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/353aa4e8
Branch: refs/heads/wicket-6.x
Commit: 353aa4e8b449a5df1b2b1f97935ca450cdc348fb
Parents: 6ce317c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 12 12:33:34 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 12 12:33:34 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/AtmosphereBehavior.java | 30 ++++++++++----------
...JQueryWicketAtmosphereResourceReference.java | 3 +-
2 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/353aa4e8/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 5116cfd..7424c81 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
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.atmosphere;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IResourceListener;
@@ -34,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.AtmosphereRequest;
import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereResourceEvent;
import org.atmosphere.cpr.AtmosphereResourceEventListener;
@@ -120,8 +119,9 @@ public class AtmosphereBehavior extends Behavior
meteor.suspend(-1);
String uuid = meteor.getAtmosphereResource().uuid();
- component.getPage().setMetaData(ATMOSPHERE_UUID, uuid);
- findEventBus().registerPage(uuid, component.getPage());
+ Page page = component.getPage();
+ page.setMetaData(ATMOSPHERE_UUID, uuid);
+ findEventBus().registerPage(uuid, page);
}
@Override
@@ -150,12 +150,11 @@ public class AtmosphereBehavior extends Behavior
{
if (log.isDebugEnabled())
{
- String transport = event.getResource()
- .getRequest()
+ AtmosphereRequest atmosphereRequest = event.getResource().getRequest();
+ String transport = atmosphereRequest
.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT);
- HttpServletRequest req = event.getResource().getRequest();
log.debug(String.format("Suspending the %s response from ip %s:%s", transport == null
- ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort()));
+ ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort()));
}
}
@@ -164,10 +163,10 @@ public class AtmosphereBehavior extends Behavior
{
if (log.isDebugEnabled())
{
- String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport");
- HttpServletRequest req = event.getResource().getRequest();
+ AtmosphereRequest atmosphereRequest = event.getResource().getRequest();
+ String transport = atmosphereRequest.getHeader("X-Atmosphere-Transport");
log.debug(String.format("Resuming the %s response from ip %s:%s", transport == null
- ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort()));
+ ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort()));
}
}
@@ -176,10 +175,10 @@ public class AtmosphereBehavior extends Behavior
{
if (log.isDebugEnabled())
{
- String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport");
- HttpServletRequest req = event.getResource().getRequest();
+ AtmosphereRequest atmosphereRequest = event.getResource().getRequest();
+ String transport = atmosphereRequest.getHeader("X-Atmosphere-Transport");
log.debug(String.format("%s connection dropped from ip %s:%s", transport == null
- ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort()));
+ ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort()));
}
// It is possible that the application has already been destroyed, in which case
// unregistration is no longer needed
@@ -192,7 +191,8 @@ public class AtmosphereBehavior extends Behavior
@Override
public void onThrowable(AtmosphereResourceEvent event)
{
- log.error(event.throwable().getMessage(), event.throwable());
+ Throwable throwable = event.throwable();
+ log.error(throwable.getMessage(), throwable);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/353aa4e8/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
index 64c385a..53c5f06 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.resource.JQueryPluginResourceReference;
/**
@@ -28,7 +27,7 @@ import org.apache.wicket.resource.JQueryPluginResourceReference;
*
* @author papegaaij
*/
-public class JQueryWicketAtmosphereResourceReference extends JavaScriptResourceReference
+public class JQueryWicketAtmosphereResourceReference extends JQueryPluginResourceReference
{
private static final long serialVersionUID = 1L;