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 14:39:54 UTC
[1/5] git commit: Minor cleanup in AtmosphereBehavior
Repository: wicket
Updated Branches:
refs/heads/master bfffed126 -> 4b95e3c74
Minor cleanup in AtmosphereBehavior
Cache call results if they are used more than once
(cherry picked from commit 353aa4e8b449a5df1b2b1f97935ca450cdc348fb)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0595bb26
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0595bb26
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0595bb26
Branch: refs/heads/master
Commit: 0595bb260d61c2231884952263d866432b1d6f46
Parents: bfffed1
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:34:56 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/0595bb26/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/0595bb26/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 8926ec6..b9089bf 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.List;
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;
[2/5] git commit: Make members final when there is no need to modify
them later
Posted by mg...@apache.org.
Make members final when there is no need to modify them later
(cherry picked from commit a969f5999d9b25c867ff0dc904186cd66de6b76b)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/31b7047e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/31b7047e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/31b7047e
Branch: refs/heads/master
Commit: 31b7047ecee9a324d20c234afc947215c1ce5d18
Parents: 0595bb2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 12 14:08:25 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 12 14:39:00 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/AtmosphereRequestHandler.java | 5 +++--
.../wicket/atmosphere/AtmosphereRequestMapper.java | 7 +++----
.../wicket/atmosphere/AtmosphereWebRequest.java | 8 ++++----
.../wicket/atmosphere/AtmosphereWebResponse.java | 2 +-
.../java/org/apache/wicket/atmosphere/EventBus.java | 15 +++++++--------
.../apache/wicket/atmosphere/EventSubscription.java | 10 +++++-----
.../java/org/apache/wicket/atmosphere/PageKey.java | 7 ++++---
7 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
index a76f440..48bd5e2e 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
@@ -18,14 +18,15 @@ package org.apache.wicket.atmosphere;
import java.util.Collection;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +64,7 @@ public class AtmosphereRequestHandler implements IRequestHandler
this.pageKey = pageKey;
this.subscriptions = subscriptions;
this.event = event;
- this.eventSubscriptionInvoker = eventSubscriptionInvoker;
+ this.eventSubscriptionInvoker = Args.notNull(eventSubscriptionInvoker, "eventSubscriptionInvoker");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestMapper.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestMapper.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestMapper.java
index 2b6b8c9..0f427e2 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestMapper.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestMapper.java
@@ -20,6 +20,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.util.lang.Args;
/**
* Internal {@link IRequestMapper} to map {@link AtmosphereWebRequest} to
@@ -29,10 +30,9 @@ import org.apache.wicket.request.Url;
*/
public class AtmosphereRequestMapper implements IRequestMapper
{
- private EventSubscriptionInvoker eventSubscriptionInvoker;
+ private final EventSubscriptionInvoker eventSubscriptionInvoker;
/**
- *
* Construct with {@link SubscribeAnnotationEventSubscriptionInvoker}
*/
public AtmosphereRequestMapper()
@@ -41,14 +41,13 @@ public class AtmosphereRequestMapper implements IRequestMapper
}
/**
- *
* Construct.
*
* @param eventSubscriptionInvoker
*/
public AtmosphereRequestMapper(EventSubscriptionInvoker eventSubscriptionInvoker)
{
- this.eventSubscriptionInvoker = eventSubscriptionInvoker;
+ this.eventSubscriptionInvoker = Args.notNull(eventSubscriptionInvoker, "eventSubscriptionInvoker");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java
index 7dd0137..bde8f55 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java
@@ -43,13 +43,13 @@ import org.apache.wicket.util.time.Time;
*/
class AtmosphereWebRequest extends ServletWebRequest
{
- private ServletWebRequest wrappedRequest;
+ private final ServletWebRequest wrappedRequest;
- private PageKey pageKey;
+ private final PageKey pageKey;
- private Collection<EventSubscription> subscriptions;
+ private final Collection<EventSubscription> subscriptions;
- private AtmosphereEvent event;
+ private final AtmosphereEvent event;
AtmosphereWebRequest(ServletWebRequest wrappedRequest, PageKey pageKey,
Collection<EventSubscription> subscriptions, AtmosphereEvent event)
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/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 6a86e97..de09ed8 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
@@ -30,7 +30,7 @@ import org.atmosphere.cpr.AtmosphereResponse;
*/
class AtmosphereWebResponse extends WebResponse
{
- private AtmosphereResponse response;
+ private final AtmosphereResponse response;
private final AppendingStringBuffer out;
private boolean redirect;
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
index ed88336..d26117f 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
@@ -102,17 +102,17 @@ public class EventBus implements UnboundListener
return eventBus;
}
- private WebApplication application;
+ private final WebApplication application;
- private Broadcaster broadcaster;
+ private final Broadcaster broadcaster;
- private Multimap<PageKey, EventSubscription> subscriptions = HashMultimap.create();
+ private final Multimap<PageKey, EventSubscription> subscriptions = HashMultimap.create();
- private Map<String, PageKey> trackedPages = Maps.newHashMap();
+ private final Map<String, PageKey> trackedPages = Maps.newHashMap();
- private List<ResourceRegistrationListener> registrationListeners = new CopyOnWriteArrayList<>();
+ private final List<ResourceRegistrationListener> registrationListeners = new CopyOnWriteArrayList<>();
- private AtmosphereParameters parameters = new AtmosphereParameters();
+ private final AtmosphereParameters parameters = new AtmosphereParameters();
/**
* Creates and registers an {@code EventBus} for the given application. The first broadcaster
@@ -278,8 +278,7 @@ public class EventBus implements UnboundListener
* Unregisters all {@link EventSubscription}s for the given component, including the
* subscriptions for its behaviors.
*
- * @param page
- * @param subscription
+ * @param component
*/
public synchronized void unregister(Component component)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java
index dfd8912..f7080bd 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java
@@ -34,15 +34,15 @@ import com.google.common.base.Predicates;
*/
public class EventSubscription
{
- private String componentPath;
+ private final String componentPath;
- private Integer behaviorIndex;
+ private final Integer behaviorIndex;
- private String methodName;
+ private final String methodName;
- private Predicate<AtmosphereEvent> filter;
+ private final Predicate<AtmosphereEvent> filter;
- private Predicate<AtmosphereEvent> contextAwareFilter;
+ private final Predicate<AtmosphereEvent> contextAwareFilter;
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/31b7047e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
index 61586a9..c875f8e 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java
@@ -17,6 +17,7 @@
package org.apache.wicket.atmosphere;
import com.google.common.base.Objects;
+import org.apache.wicket.util.lang.Args;
/**
* Identifies a page by its id and the session it belongs to.
@@ -25,9 +26,9 @@ import com.google.common.base.Objects;
*/
public class PageKey
{
- private Integer pageId;
+ private final Integer pageId;
- private String sessionId;
+ private final String sessionId;
/**
* Construct.
@@ -37,7 +38,7 @@ public class PageKey
*/
public PageKey(Integer pageId, String sessionId)
{
- this.pageId = pageId;
+ this.pageId = Args.notNull(pageId, "pageId");
this.sessionId = sessionId;
}
[3/5] git commit: EventBus#removeRegistrationListener() should
*remove* the listeners
Posted by mg...@apache.org.
EventBus#removeRegistrationListener() should *remove* the listeners
(cherry picked from commit c539f680b0be205322dfbec2cb1281e473d22c12)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/24c8eb12
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/24c8eb12
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/24c8eb12
Branch: refs/heads/master
Commit: 24c8eb12ae96cd4b45c47f2104efa61605849a12
Parents: 31b7047
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 12 14:09:16 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 12 14:39:21 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/atmosphere/EventBus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/24c8eb12/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
index d26117f..bce0720 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
@@ -456,7 +456,7 @@ public class EventBus implements UnboundListener
*/
public void removeRegistrationListener(ResourceRegistrationListener listener)
{
- registrationListeners.add(listener);
+ registrationListeners.remove(listener);
}
private void fireRegistration(String uuid, Page page)
[4/5] git commit: Cache the got value and reuse it in a method
Posted by mg...@apache.org.
Cache the got value and reuse it in a method
(cherry picked from commit ca6e424c89d3b75216e58bf0733637aeb37c4a8c)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3d9a4a6f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3d9a4a6f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3d9a4a6f
Branch: refs/heads/master
Commit: 3d9a4a6f5968b84338cc46f9255f9f02b30ca0dc
Parents: 24c8eb1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 12 14:10:06 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 12 14:39:32 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/AtmosphereRequestHandler.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3d9a4a6f/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
index 48bd5e2e..8824468 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
@@ -70,8 +70,9 @@ public class AtmosphereRequestHandler implements IRequestHandler
@Override
public void respond(IRequestCycle requestCycle)
{
- Page page = (Page)Application.get().getMapperContext().getPageInstance(pageKey.getPageId());
- AjaxRequestTarget target = WebApplication.get().newAjaxRequestTarget(page);
+ WebApplication application = WebApplication.get();
+ Page page = (Page)application.getMapperContext().getPageInstance(pageKey.getPageId());
+ AjaxRequestTarget target = application.newAjaxRequestTarget(page);
executeHandlers(target, page);
}
@@ -85,14 +86,15 @@ public class AtmosphereRequestHandler implements IRequestHandler
Component component = page.get(componentPath);
if (component != null)
{
- if (curSubscription.getBehaviorIndex() == null)
+ Integer behaviorIndex = curSubscription.getBehaviorIndex();
+ if (behaviorIndex == null)
{
invokeMethod(target, curSubscription, component);
}
else
{
- invokeMethod(target, curSubscription,
- component.getBehaviorById(curSubscription.getBehaviorIndex()));
+ Behavior behavior = component.getBehaviorById(behaviorIndex);
+ invokeMethod(target, curSubscription, behavior);
}
}
else
[5/5] git commit: Use #getBroadcaster() to be able to use a custom
one for testing
Posted by mg...@apache.org.
Use #getBroadcaster() to be able to use a custom one for testing
(cherry picked from commit d0a29b0e54b2cd474c01637fe278887c5351ada7)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4b95e3c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4b95e3c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4b95e3c7
Branch: refs/heads/master
Commit: 4b95e3c74ee46002ad41c040bb031c7081d722a5
Parents: 3d9a4a6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 12 14:10:34 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 12 14:39:46 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/atmosphere/EventBus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4b95e3c7/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
index bce0720..1f121f5 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java
@@ -363,7 +363,7 @@ public class EventBus implements UnboundListener
ThreadContext oldContext = ThreadContext.get(false);
try
{
- for (AtmosphereResource resource : ImmutableList.copyOf(broadcaster.getAtmosphereResources()))
+ for (AtmosphereResource resource : ImmutableList.copyOf(getBroadcaster().getAtmosphereResources()))
{
postToSingleResource(event, resource);
}