Small optimization, synchronize only when perRequestFilters are defined

Atmosphere · Nov 19, 2012 · 978ec4c · 978ec4c
1 parent 7bdfa64
commit 978ec4c
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java
@@ -704,28 +704,26 @@ protected Object perRequestFilter(AtmosphereResource r, Entry msg) {
 
         Object finalMsg = msg.message;
 
-        if (AtmosphereResourceImpl.class.isAssignableFrom(r.getClass())) {
-            synchronized (r) {
-                if (isAtmosphereResourceValid(r)) {
-                    if (bc.hasPerRequestFilters()) {
-                        BroadcastAction a = bc.filter(r, msg.message, msg.originalMessage);
-                        if (a.action() == BroadcastAction.ACTION.ABORT) {
-                            return null;
-                        }
-                        if (a.message() != msg.originalMessage) {
-                            finalMsg = a.message();
-                        }
+        if (isAtmosphereResourceValid(r)) {
+            if (bc.hasPerRequestFilters()) {
+                synchronized (r) {
+                    BroadcastAction a = bc.filter(r, msg.message, msg.originalMessage);
+                    if (a.action() == BroadcastAction.ACTION.ABORT) {
+                        return null;
+                    }
+                    if (a.message() != msg.originalMessage) {
+                        finalMsg = a.message();
                     }
-                } else {
-                    // The resource is no longer valid.
-                    removeAtmosphereResource(r);
-                    BroadcasterFactory.getDefault().removeAllAtmosphereResource(r);
-                }
-
-                if (cacheStrategy == BroadcasterCache.STRATEGY.AFTER_FILTER) {
-                    trackBroadcastMessage(r, finalMsg);
                 }
             }
+        } else {
+            // The resource is no longer valid.
+            removeAtmosphereResource(r);
+            BroadcasterFactory.getDefault().removeAllAtmosphereResource(r);
+        }
+
+        if (cacheStrategy == BroadcasterCache.STRATEGY.AFTER_FILTER) {
+            trackBroadcastMessage(r, finalMsg);
         }
         return finalMsg;
     }