Atmosphere · inah11 · Sep 19, 2013 · Sep 19, 2013 · Sep 19, 2013 · Sep 19, 2013
diff --git a/assembly/cpr/pom.xml b/assembly/cpr/pom.xml
@@ -3,21 +3,21 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-runtime-libs</artifactId>
     <name>atmosphere-runtime-libs</name>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.8-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-runtime</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/assembly/jersey/pom.xml b/assembly/jersey/pom.xml
@@ -3,21 +3,21 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-jersey-libs</artifactId>
     <name>atmosphere-jersey-libs</name>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.8-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-jersey</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-assembly</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>atmosphere-assembly</name>
     <url>https://github.com/Atmosphere/atmosphere</url>

diff --git a/modules/annotations/pom.xml b/modules/annotations/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-annotations</artifactId>
     <packaging>bundle</packaging>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.8-SNAPSHOT</version>
     <name>atmosphere-annotations</name>
     <url>https://github.com/Atmosphere/atmosphere</url>
     <build>

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Asynchronous.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Asynchronous.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Publish.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Publish.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Subscribe.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Subscribe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/pom.xml b/modules/cpr/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-runtime</artifactId>
     <packaging>bundle</packaging>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.8-SNAPSHOT</version>
     <name>atmosphere-runtime</name>
     <url>https://github.com/Atmosphere/atmosphere</url>
     <build>

diff --git a/modules/cpr/src/main/java/org/atmosphere/BroadcastFilterAdapter.java b/modules/cpr/src/main/java/org/atmosphere/BroadcastFilterAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/AnnotationUtil.java b/modules/cpr/src/main/java/org/atmosphere/annotation/AnnotationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/...les/cpr/src/main/java/org/atmosphere/annotation/AsyncSupportListenerServiceProcessor.java b/...les/cpr/src/main/java/org/atmosphere/annotation/AsyncSupportListenerServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/AsyncSupportServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/AsyncSupportServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/AtmosphereHandlerServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/AtmosphereHandlerServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/...es/cpr/src/main/java/org/atmosphere/annotation/AtmosphereInterceptorServiceProcessor.java b/...es/cpr/src/main/java/org/atmosphere/annotation/AtmosphereInterceptorServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/AtmosphereServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/AtmosphereServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcastFilterServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcastFilterServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/...pr/src/main/java/org/atmosphere/annotation/BroadcasterCacheInspectorServiceProcessor.java b/...pr/src/main/java/org/atmosphere/annotation/BroadcasterCacheInspectorServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterCacheServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterCacheServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterFactoryServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterFactoryServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterListenerServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterListenerServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/BroadcasterServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/EndpointMapperServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/EndpointMapperServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/ManagedServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/ManagedServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -42,6 +42,8 @@ public void handle(AtmosphereFramework framework, Class<?> annotatedClass) {
         try {
             Class<?> aClass = annotatedClass;
             ManagedService a = aClass.getAnnotation(ManagedService.class);
+            framework.setBroadcasterCacheClassName(a.broadcasterCache().getName());
+
             List<AtmosphereInterceptor> l = new ArrayList<AtmosphereInterceptor>();
 
             atmosphereConfig(a.atmosphereConfig(), framework);
@@ -56,7 +58,7 @@ public void handle(AtmosphereFramework framework, Class<?> annotatedClass) {
             Object c = aClass.newInstance();
             AtmosphereHandler handler = new ManagedAtmosphereHandler(c);
             // MUST BE ADDED FIRST, ALWAYS!
-            l.add(new ManagedServiceInterceptor(ManagedAtmosphereHandler.class.cast(handler)));
+            l.add(new ManagedServiceInterceptor());
 
             Class<?>[] interceptors = a.interceptors();
             for (Class i : interceptors) {

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/MeteorServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/MeteorServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -46,6 +46,7 @@ public void handle(AtmosphereFramework framework, Class<?> annotatedClass) {
 
             Class<Servlet> s = (Class<Servlet>) annotatedClass;
             MeteorService m = s.getAnnotation(MeteorService.class);
+            framework.setBroadcasterCacheClassName(m.broadcasterCache().getName());
 
             String mapping = m.path();
 
@@ -72,7 +73,6 @@ public void handle(AtmosphereFramework framework, Class<?> annotatedClass) {
                 framework.interceptors().add(new MeteorServiceInterceptor());
             }
             framework.addAtmosphereHandler(mapping, r, l);
-            framework.setBroadcasterCacheClassName(m.broadcasterCache().getName());
         } catch (Throwable e) {
             logger.warn("", e);
         }

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/Processor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/Processor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketHandlerServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketHandlerServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketProcessorServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketProcessorServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketProtocolServiceProcessor.java b/modules/cpr/src/main/java/org/atmosphere/annotation/WebSocketProtocolServiceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/AbstractBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/AbstractBroadcasterCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -100,7 +100,7 @@ public void stop() {
     }
 
     protected CacheMessage put(BroadcastMessage message, Long now) {
-        if (!inspect(message)) return null;
+        if (message == null || !inspect(message)) return null;
 
         logger.trace("Caching message {} for Broadcaster {}", message.message);
 

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/BroadcastMessage.java b/modules/cpr/src/main/java/org/atmosphere/cache/BroadcastMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/BroadcasterCacheInspector.java b/modules/cpr/src/main/java/org/atmosphere/cache/BroadcasterCacheInspector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/CacheMessage.java b/modules/cpr/src/main/java/org/atmosphere/cache/CacheMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -21,11 +21,10 @@ public class CacheMessage {
 
     private final String id;
     private long createTime;
+    private UUIDBroadcasterCache.ClientQueue queue;
 
     public CacheMessage(String id, Object message) {
-        this.id = id;
-        this.message = message;
-        this.createTime = System.nanoTime();
+        this(id, System.nanoTime(), message);
     }
 
     public CacheMessage(String id, Long now, Object message) {

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/DefaultBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/DefaultBroadcasterCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/HeaderBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/HeaderBroadcasterCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Jeanfrancois Arcand
+ * Copyright 2014 Jeanfrancois Arcand
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of