0
@@ -115,6 +115,15 @@
0
       sleep(1);
0
     }
0
   }
0
+	
0
+	void deleteStatusReportFIFO() {
0
+		if (!statusReportFIFO.empty()) {
0
+			int ret;
0
+			do {
0
+				ret = unlink(statusReportFIFO.c_str());
0
+			} while (ret == -1 && errno == EINTR);
0
+		}
0
+	}
0
 
0
 public:
0
   Server(int serverSocket,
0
@@ -148,10 +157,7 @@
0
       clients.clear();
0
     }
0
     clientsCopy.clear();
0
-		
0
-		do {
0
-			ret = unlink(statusReportFIFO.c_str());
0
-		} while (ret == -1 && errno == EINTR);
0
+		deleteStatusReportFIFO();
0
   }
0
   
0
   int start(); // Will be defined later, because Client depends on Server's interface.
0
@@ -369,11 +375,7 @@
0
   
0
   ~Client() {
0
     if (thr != NULL) {
0
-			// We don't want to wait for the client to close the connection,
0
-			// if we were told to shutdown.
0
-			if (!serverDone) {
0
-				thr->join();
0
-			}
0
+			thr->join();
0
       delete thr;
0
     }
0
     close(fd);
0
@@ -439,6 +441,10 @@
0
       clients.insert(client);
0
     }
0
     client->start(client);
0
+	}
0
+	if (serverDone) {
0
+		deleteStatusReportFIFO();
0
+		exit(0);
0
   }
0
   return 0;
0
 }