0
@@ -2,6 +2,8 @@
0
 #define _PASSENGER_APPLICATION_POOL_H_
0
 
0
 #include <boost/shared_ptr.hpp>
0
+#include <boost/thread/mutex.hpp>
0
+
0
 #include <string>
0
 #include <map>
0
 
0
@@ -26,6 +28,8 @@
0
 
0
   SpawnManager spawnManager;
0
   ApplicationMap apps;
0
+	mutex lock;
0
+	bool threadSafe;
0
   
0
   string normalizePath(const string &path) {
0
     // TODO
0
0
0
0
0
0
@@ -37,23 +41,27 @@
0
                const string &logFile = "",
0
                const string &environment = "production",
0
                const string &rubyCommand = "ruby")
0
-	: spawnManager(spawnManagerCommand, logFile, environment, rubyCommand) {}
0
+	: spawnManager(spawnManagerCommand, logFile, environment, rubyCommand) {
0
+		threadSafe = false;
0
+	}
0
   
0
+	void setThreadSafe() {
0
+		threadSafe = true;
0
+	}
0
+	
0
   // TODO: improve algorithm
0
-	// TODO: make thread-safe
0
-	// TODO: make it possible to share an ApplicationPool between processes
0
   virtual ApplicationPtr get(const string &appRoot, const string &user = "", const string &group = "") {
0
     string normalizedAppRoot(normalizePath(appRoot));
0
-		//scoped_lock l(lock);
0
-		
0
     ApplicationPtr app;
0
-		//ApplicationMap::iterator it(apps.find(appRoot));
0
-		//if (it == apps.end()) {
0
+		mutex::scoped_lock l(lock, threadSafe);
0
+		
0
+		ApplicationMap::iterator it(apps.find(appRoot));
0
+		if (it == apps.end()) {
0
       app = spawnManager.spawn(appRoot, user, group);
0
-		//	apps[appRoot] = app;
0
-		//} else {
0
-		//	app = it->second;
0
-		//}
0
+			apps[appRoot] = app;
0
+		} else {
0
+			app = it->second;
0
+		}
0
     return app;
0
   }
0
 };