From 4ff8679b49d2ca4672788c94db658ced32ab3da4 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sun, 27 Jul 2014 11:11:40 +0200
Subject: [PATCH] dispatcher: Really merge it, verify that install is called

---
 Dispatcher.st        | 2 +-
 Tests.st             | 4 ++++
 changes_for_pharo.st | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dispatcher.st b/Dispatcher.st
index d6121fb..0442512 100644
--- a/Dispatcher.st
+++ b/Dispatcher.st
@@ -23,7 +23,7 @@ Object subclass: Dispatcher [
 
     Dispatcher class >> instance [
         <category: 'singleton'>
-        ^ Smalltalk at: #OsmoDispatcher ifAbsentPut: [Dispatcher new].
+        ^ Smalltalk at: #OsmoDispatcher ifAbsent: [self install].
     ]
 
     Dispatcher class >> new [
diff --git a/Tests.st b/Tests.st
index 4e88ec0..b256966 100644
--- a/Tests.st
+++ b/Tests.st
@@ -30,6 +30,10 @@ TestCase subclass: DispatcherTest [
         OsmoDispatcher dispatchBlock: [sem signal].
         self assert: sem signals = 1.
     ]
+
+    testSameDispatcher[
+        self assert: Dispatcher instance == Dispatcher instance
+    ]
 ]
 
 TestCase subclass: TimerSchedulerTest [
diff --git a/changes_for_pharo.st b/changes_for_pharo.st
index c452aad..0df5832 100644
--- a/changes_for_pharo.st
+++ b/changes_for_pharo.st
@@ -49,6 +49,6 @@ TimerScheduler extend [
 
 Dispatcher class extend [
     initialize [
-        ^ self instance
+        self instance
     ]
 ]