Fixes #1785

Atmosphere · Nov 21, 2014 · 9371be0 · 9371be0
1 parent ae43e56
commit 9371be0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
@@ -2977,7 +2977,14 @@ public AtmosphereResourceFactory atmosphereFactory() {
     }
 
     private AtmosphereFramework configureAtmosphereResourceFactory() {
-        arFactory = new AtmosphereResourceFactory(broadcasterFactory);
+        try {
+            arFactory = newClassInstance(AtmosphereResourceFactory.class, AtmosphereResourceFactory.class);
+        } catch (InstantiationException e) {
+            logger.error("", e);
+        } catch (IllegalAccessException e) {
+            logger.error("", e);
+        }
+        arFactory.configure(config);
         return this;
     }
 

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceFactory.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceFactory.java
@@ -16,7 +16,6 @@
 package org.atmosphere.cpr;
 
 import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
-import org.atmosphere.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,14 +66,17 @@ public void onRequest(AtmosphereResource resource) throws IOException {
         public void destroy() {
         }
     };
-    private final BroadcasterFactory broadcasterFactory;
+    private BroadcasterFactory broadcasterFactory;
 
-    public AtmosphereResourceFactory(BroadcasterFactory broadcasterFactory){
-        this.broadcasterFactory = broadcasterFactory;
+    public AtmosphereResourceFactory(){
         // This is quite ugly, but here for legacy reason.
         factory = this;
     }
 
+    public void configure(AtmosphereConfig config) {
+        this.broadcasterFactory = config.getBroadcasterFactory();
+    }
+
     private final ConcurrentHashMap<String, AtmosphereResource> resources = new ConcurrentHashMap<String, AtmosphereResource>();
 
     /**
@@ -335,4 +337,5 @@ private void setDefaultSerializer(AtmosphereConfig config, AtmosphereResource r)
             r.setSerializer(serializer);
         }
     }
+
 }