Merge pull request #25 from survivant/master

little refactoring for : HeaderBroadcasterCache that didn't extends the right class
Atmosphere · Sep 20, 2011 · f1dccb0 · f1dccb0
2 parents ef70a70 + 30a90d1
commit f1dccb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/HeaderBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/HeaderBroadcasterCache.java
@@ -62,7 +62,7 @@
  *
  * @author Jeanfrancois Arcand
  */
-public class HeaderBroadcasterCache extends SessionBroadcasterCache {
+public class HeaderBroadcasterCache extends BroadcasterCacheBase {
 
     public static final String HEADER_CACHE = "X-Cache-Date";
 

diff --git a/modules/jersey/src/test/java/org/atmosphere/jersey/tests/BasePubSubTest.java b/modules/jersey/src/test/java/org/atmosphere/jersey/tests/BasePubSubTest.java
@@ -456,7 +456,7 @@ public void testHeaderBroadcasterCache() throws IllegalAccessException, ClassNot
             c.preparePost(urlTarget).addParameter("message", "cachememe").execute().get();
 
             //Suspend
-            Response r = c.prepareGet(urlTarget + "/subscribeAndResume").addHeader("X-Cache-Date", String.valueOf(t1)).execute(new AsyncCompletionHandler<Response>() {
+            Response r = c.prepareGet(urlTarget + "/subscribeAndResume").addHeader(HeaderBroadcasterCache.HEADER_CACHE, String.valueOf(t1)).execute(new AsyncCompletionHandler<Response>() {
 
                 @Override
                 public Response onCompleted(Response r) throws Exception {

diff --git a/modules/jersey/src/test/java/org/atmosphere/jersey/tests/PubSubTest.java b/modules/jersey/src/test/java/org/atmosphere/jersey/tests/PubSubTest.java
@@ -47,7 +47,6 @@
 import org.atmosphere.util.StringFilterAggregator;
 import org.atmosphere.util.XSSHtmlFilter;
 
-import javax.annotation.PreDestroy;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -138,7 +137,7 @@ public String suspend() {
     }
 
     /**
-     * Suspend the response, and tell teh framework to resume the response
+     * Suspend the response, and tell the framework to resume the response
      * when the first @Broadcast operation occurs.
      * @return A {@link org.atmosphere.jersey.Broadcastable} used to broadcast events.
      */