More fixes for #1785

Atmosphere · Nov 21, 2014 · c50d9ee · c50d9ee
1 parent ba4c76a
commit c50d9ee
Show file tree

Hide file tree

Showing 11 changed files with 444 additions and 399 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereConfig.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereConfig.java
@@ -301,7 +301,7 @@ public AtmosphereResourceFactory resourcesFactory(){
     }
 
     /**
-     * Return the {@link org.atmosphere.cpr.MetaBroadcaster}
+     * Return the {@link DefaultMetaBroadcaster}
      * @return the MetaBroadcaster
      */
     public MetaBroadcaster metaBroadcaster(){

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
@@ -873,6 +873,7 @@ public Enumeration<String> getInitParameterNames() {
             configureAnnotationPackages();
 
             configureBroadcasterFactory();
+            configureMetaBroadcaster();
             configureScanningPackage(scFacade, ApplicationConfig.ANNOTATION_PACKAGE);
             configureScanningPackage(scFacade, FrameworkConfig.JERSEY2_SCANNING_PACKAGE);
             configureScanningPackage(scFacade, FrameworkConfig.JERSEY_SCANNING_PACKAGE);
@@ -885,7 +886,6 @@ public Enumeration<String> getInitParameterNames() {
 
             // Reconfigure in case an annotation changed the default.
             configureBroadcasterFactory();
-            configureMetaBroadcaster();
             patchContainer();
             configureBroadcaster();
             loadConfiguration(scFacade);
@@ -3011,14 +3011,17 @@ private AtmosphereFramework configureAtmosphereResourceFactory() {
     }
 
     public MetaBroadcaster metaBroadcaster() {
-        if (metaBroadcaster == null) {
-            metaBroadcaster = new MetaBroadcaster(config);
-        }
         return metaBroadcaster;
     }
 
     private AtmosphereFramework configureMetaBroadcaster() {
-        if (metaBroadcaster == null) {
+        try {
+            metaBroadcaster = newClassInstance(MetaBroadcaster.class, DefaultMetaBroadcaster.class);
+            metaBroadcaster.configure(config);
+        } catch (InstantiationException e) {
+            logger.error("", e);
+        } catch (IllegalAccessException e) {
+            logger.error("", e);
         }
         return this;
     }
@@ -3082,7 +3085,13 @@ private void initDefaultSerializer() {
      */
     public synchronized AtmosphereResourceSessionFactory sessionFactory() {
         if (sessionFactory == null) {
-            sessionFactory = new DefaultAtmosphereResourceSessionFactory();
+            try {
+                sessionFactory = newClassInstance(AtmosphereResourceSessionFactory.class, DefaultAtmosphereResourceSessionFactory.class);
+            } catch (InstantiationException e) {
+                logger.error("", e);
+            } catch (IllegalAccessException e) {
+                logger.error("", e);
+            }
         }
         return sessionFactory;
     }

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceSessionFactory.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceSessionFactory.java
@@ -20,7 +20,7 @@
  *
  * @author uklance (https://github.com/uklance)
  */
-public abstract class AtmosphereResourceSessionFactory {
+public interface AtmosphereResourceSessionFactory {
 
     /**
      * Returns the current session associated with the
@@ -36,7 +36,7 @@ public abstract class AtmosphereResourceSessionFactory {
      * @return the session associated with this request or null if create is
      * false and the resource has no valid session
      */
-    public abstract AtmosphereResourceSession getSession(AtmosphereResource resource, boolean create);
+    AtmosphereResourceSession getSession(AtmosphereResource resource, boolean create);
 
     /**
      * Returns the current session associated with the
@@ -47,9 +47,7 @@ public abstract class AtmosphereResourceSessionFactory {
      * {@link AtmosphereResource}, or creates one if it does not yet
      * exist.
      */
-    public AtmosphereResourceSession getSession(AtmosphereResource resource) {
-        return getSession(resource, true);
-    }
+    AtmosphereResourceSession getSession(AtmosphereResource resource);
 
-    public abstract void destroy();
+    void destroy();
 }
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAtmosphereResourceSessionFactory.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAtmosphereResourceSessionFactory.java
@@ -21,7 +21,7 @@
 /**
  * @author uklance (https://github.com/uklance)
  */
-public class DefaultAtmosphereResourceSessionFactory extends AtmosphereResourceSessionFactory {
+public class DefaultAtmosphereResourceSessionFactory implements AtmosphereResourceSessionFactory {
     private final ConcurrentMap<String, AtmosphereResourceSession> sessions = new ConcurrentHashMap<String, AtmosphereResourceSession>();
 
     private final AtmosphereResourceEventListener disconnectListener = new AtmosphereResourceEventListenerAdapter() {
@@ -54,6 +54,11 @@ public AtmosphereResourceSession getSession(AtmosphereResource r, boolean create
         return session;
     }
 
+    @Override
+    public AtmosphereResourceSession getSession(AtmosphereResource resource) {
+        return getSession(resource, true);
+    }
+
     @Override
     public void destroy() {
         sessions.clear();