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/06/10 09:47:17 UTC
[2/3] git commit: Notify resource registration listeners only after
Meteor is suspended so it can be found by uuid
Notify resource registration listeners only after Meteor is suspended so it can be found by uuid
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e40cb53a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e40cb53a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e40cb53a
Branch: refs/heads/wicket-6.x
Commit: e40cb53a5a85e9ff23818fc360633e3a70b8d22c
Parents: a14c74f
Author: Leonid Bogdanov <le...@mail.ru>
Authored: Fri Jun 7 22:44:36 2013 +0400
Committer: Leonid Bogdanov <le...@mail.ru>
Committed: Fri Jun 7 22:44:36 2013 +0400
----------------------------------------------------------------------
.../org/apache/wicket/atmosphere/AtmosphereBehavior.java | 10 ++++------
.../main/java/org/apache/wicket/atmosphere/EventBus.java | 4 ++--
.../org/apache/wicket/atmosphere/EventSubscription.java | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e40cb53a/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 c434ee9..83e3de7 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
@@ -105,24 +105,22 @@ public class AtmosphereBehavior extends Behavior
// Grab a Meteor
Meteor meteor = Meteor.build(request.getContainerRequest());
- String uuid = meteor.getAtmosphereResource().uuid();
- component.getPage().setMetaData(ATMOSPHERE_UUID, uuid);
- findEventBus().registerPage(uuid, component.getPage());
-
// Add us to the listener list.
meteor.addListener(this);
String transport = request.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT);
if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport))
{
- // request.getContainerRequest().setAttribute(ApplicationConfig.RESUME_ON_BROADCAST,
- // Boolean.TRUE);
meteor.suspend(-1, false);
}
else
{
meteor.suspend(-1);
}
+
+ String uuid = meteor.getAtmosphereResource().uuid();
+ component.getPage().setMetaData(ATMOSPHERE_UUID, uuid);
+ findEventBus().registerPage(uuid, component.getPage());
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/e40cb53a/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 5154794..5f2dc44 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
@@ -140,8 +140,8 @@ public class EventBus implements UnboundListener
}
/**
- * Returns the {@linkplain AtmosphereParameters paramters} that will be passed to the Atmosphere
- * JQuery plugin. You can change these parameters, for example to disable WebSockets.
+ * Returns the {@linkplain AtmosphereParameters parameters} that will be passed to the
+ * Atmosphere JQuery plugin. You can change these parameters, for example to disable WebSockets.
*
* @return The parameters.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/e40cb53a/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 b305867..36fda28 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
@@ -109,7 +109,7 @@ public class EventSubscription
}
/**
- * @return The filter on incomming events, a combination of the type and the
+ * @return The filter on incoming events, a combination of the type and the
* {@link Subscribe#filter()} parameter.
*/
public Predicate<AtmosphereEvent> getFilter()
@@ -118,7 +118,7 @@ public class EventSubscription
}
/**
- * @return The context ware filter on incomming events, constructed from the
+ * @return The context ware filter on incoming events, constructed from the
* {@link Subscribe#contextAwareFilter()} parameter.
*/
public Predicate<AtmosphereEvent> getContextAwareFilter()