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/05/04 14:29:17 UTC
git commit: fix atmosphere example chat part
Updated Branches:
refs/heads/master b97026292 -> 4a23b74c4
fix atmosphere example chat part
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4a23b74c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4a23b74c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4a23b74c
Branch: refs/heads/master
Commit: 4a23b74c4c09dc143d357eff2ec857cf0a5ddd3c
Parents: b970262
Author: Emond Papegaaij <pa...@apache.org>
Authored: Fri May 4 14:28:51 2012 +0200
Committer: Emond Papegaaij <pa...@apache.org>
Committed: Fri May 4 14:28:51 2012 +0200
----------------------------------------------------------------------
.../wicket/examples/atmosphere/HomePage.java | 11 ++++++++---
.../org/apache/wicket/atmosphere/EventBus.java | 4 ++++
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4a23b74c/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
index f53221a..6c95d05 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java
@@ -20,7 +20,7 @@ import java.util.Date;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.atmosphere.EventBus;
import org.apache.wicket.atmosphere.Subscribe;
import org.apache.wicket.examples.WicketExamplePage;
@@ -46,15 +46,20 @@ public class HomePage extends WicketExamplePage
Form<Void> form = new Form<Void>("form");
add(form);
form.add(input = new TextField<String>("input", Model.of("")));
- form.add(new AjaxLink<Void>("send")
+ form.add(new AjaxSubmitLink("send", form)
{
private static final long serialVersionUID = 1L;
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
EventBus.get().post(input.getModelObject());
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form)
+ {
+ }
});
setVersioned(false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/4a23b74c/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 06279e1..8784fda 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
@@ -111,8 +111,10 @@ public class EventBus implements UnboundListener
public void post(Object event)
{
+ ThreadContext oldContext = ThreadContext.get(false);
try
{
+ ThreadContext.restore(null);
ThreadContext.setApplication(application);
for (AtmosphereResource resource : broadcaster.getAtmosphereResources())
{
@@ -134,6 +136,8 @@ public class EventBus implements UnboundListener
finally
{
ThreadContext.detach();
+ if (oldContext != null)
+ ThreadContext.restore(oldContext);
}
}