Van zárolás

skeleton/Program/Source/dataAccess/CloudFileSystem.cpp

@@ -78,6 +78,9 @@ bool CloudFileSystem::deleteFile(FileDescriptor fileDescriptor) {
 
 	if (findByID(&fileDescriptor) != NULL){
 		FileDescriptor* fileOnCloud = findByID(&fileDescriptor);
+
+		if (!isLocked(*fileOnCloud))
+		{
 			if (application.cal.deleteFile(*fileOnCloud)){
 				if (delFromFileTreeByID(fileOnCloud)){
 					cfl.save();
@@ -85,6 +88,11 @@ bool CloudFileSystem::deleteFile(FileDescriptor fileDescriptor) {
 				}
 			}
 		}
+		else
+		{
+			std::cerr << "File is locked" << endl;
+		}
+	}
 	return false;
 }
 

skeleton/Program/Source/dataAccess/CloudFileSystem.h

@@ -164,8 +164,6 @@ public:
 	* Retrieves fileDescriptor from the fileTree
 	*/
 	FileDescriptor* findByID(FileDescriptor* fileDescriptor);
-private: 
-	CloudFileList cfl;
 
 	/**
 	* Creates a lock on a given file.
@@ -185,6 +183,8 @@ private:
 	* @return true if any of the fragments are locked, false otherwise
 	*/
 	bool isLocked(FileDescriptor fileDescriptor);
+private: 
+	CloudFileList cfl;
 };
 
 #endif //_CLOUDFILESYSTEM_H
\ No newline at end of file

skeleton/Program/Source/dataAccess/ComputeOnClient.cpp

@@ -45,7 +45,18 @@ string ComputeOnClient::getFile(FileDescriptor fileDescriptor) {
 		return "Clouds doesn't contain the file.";
 	} else {
 		FileDescriptor* fileToDownload = cloudFileSystem.findByID(&fileDescriptor);
+
+		if (!cloudFileSystem.isLocked(*fileToDownload))
+		{
+			cloudFileSystem.lock(*fileToDownload);
 			FileDescriptor* downloaded = cloudFileSystem.getCloudAccessLayer()->download(*fileToDownload);
+			cloudFileSystem.unlock(*fileToDownload);
+
 			return Decoder::decode(downloaded);
 		}
+		else
+		{
+			std::cerr << "File is locked" << endl;
+		}
+	}
 }
\ No newline at end of file