Merge pull request #112 from pusher/rejected-execution

Synchronize queueOnEventThread

src/main/java/com/pusher/client/util/Factory.java

@@ -40,9 +40,6 @@
  * {@link #newPublicChannel(String)} creates a new instance of that class every
  * time it is called.
  *
- * - any method that starts with "get", such as {@link #getEventQueue()} returns
- * a singleton. These are lazily constructed and their access methods should be
- * synchronized for this reason.
  */
 public class Factory {
 
@@ -97,8 +94,11 @@ public synchronized ChannelManager getChannelManager() {
         return channelManager;
     }
 
-    public void queueOnEventThread(final Runnable r) {
-        getEventQueue().execute(new Runnable() {
+    public synchronized void queueOnEventThread(final Runnable r) {
+        if (eventQueue == null) {
+            eventQueue = Executors.newSingleThreadExecutor(new DaemonThreadFactory("eventQueue"));
+        }
+        eventQueue.execute(new Runnable() {
             @Override
             public void run() {
                 synchronized (eventLock) {
@@ -119,13 +119,6 @@ public synchronized void shutdownThreads() {
         }
     }
 
-    private synchronized ExecutorService getEventQueue() {
-        if (eventQueue == null) {
-            eventQueue = Executors.newSingleThreadExecutor(new DaemonThreadFactory("eventQueue"));
-        }
-        return eventQueue;
-    }
-
     private static class DaemonThreadFactory implements ThreadFactory {
         private final String name;