1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/demo/Ice/session/Server.cpp b/cpp/demo/Ice/session/Server.cpp
index 3c5da0ef43a..6199c3d5025 100644
--- a/cpp/demo/Ice/session/Server.cpp
+++ b/cpp/demo/Ice/session/Server.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <Ice/Ice.h>
+#include <Ice/Ice.h> // XXX Get rid of this, see other comments.
 #include <SessionFactoryI.h>
 #include <ReapThread.h>
 
@@ -18,10 +18,12 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("SessionFactory");
+
     ReapThreadPtr reaper = ReapThread::instance();
+    reaper->start();
+
     adapter->add(new SessionFactoryI, Ice::stringToIdentity("SessionFactory"));
     adapter->activate();
-    reaper->start();
     communicator->waitForShutdown();
 
     reaper->terminate();