Skip to content

Commit

Permalink
Some minor fixes so that things work properly on rhel5
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Dickey committed Mar 7, 2008
1 parent 511bf19 commit 11d20e5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion TODO
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See http://trac.atomiclabs.com/
See http://pion.org/ticket-tracking
2 changes: 1 addition & 1 deletion platform/include/pion/platform/ReactionEngine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class PION_PLATFORM_API ReactionEngine :
DatabaseManager& database_mgr);

/// virtual destructor
virtual ~ReactionEngine() { stop(); }
virtual ~ReactionEngine() { stop(); m_scheduler.shutdown(); }

/// opens an existing configuration file and loads the plug-ins it contains
virtual void openConfigFile(void);
Expand Down
1 change: 1 addition & 0 deletions platform/server/ServiceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ServiceManager::~ServiceManager()
// stop servers first
boost::mutex::scoped_lock services_lock(m_mutex);
m_servers.clear();
m_scheduler.shutdown();
}

void ServiceManager::openConfigFile(void)
Expand Down
3 changes: 3 additions & 0 deletions platform/tests/ReactorTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,9 @@ BOOST_AUTO_TEST_CASE(checkDatabaseOutputReactor) {
// check the contents of the new database
//

// first stop the data store reactor to make sure the events get flushed
m_reaction_engine.stopReactor(m_clickstream_id);

// open the database
DatabasePtr db_ptr = m_database_mgr.getDatabase(m_embedded_db_id);
BOOST_REQUIRE(db_ptr);
Expand Down

0 comments on commit 11d20e5

Please sign in to comment.