Fixed compression thread lock in FileSystemBlockService

Author: tsutomi

src/cloudb-nunit/Deveel.Data/ShardedDataTestBase.cs

@@ -37,7 +37,7 @@ protected virtual IDatabase CreateDatabase() {
 			if (storeType == StoreType.FileSystem) {
 				string testPath = TestPath;
 				if (Directory.Exists(testPath))
-					Directory.Delete(testPath);
+					Directory.Delete(testPath, true);
 
 				Directory.CreateDirectory(testPath);
 				return new FileSystemDatabase(testPath);

src/cloudb-nunit/cloudb-nunit.csproj

@@ -65,9 +65,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\cloudb.1.5.4.2\lib\net20\cloudb.dll</HintPath>
     </Reference>
-    <Reference Include="cloudb-service">
-      <HintPath>..\packages\cloudb-service.8.1.0\lib\net20\cloudb-service.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
@@ -121,6 +118,12 @@
   <ItemGroup>
     <None Include="Deveel.Data.Net\ChangeLog" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\cloudb-service\cloudb-service.csproj">
+      <Project>{682fa6a5-8786-4b75-bc04-df35267d80de}</Project>
+      <Name>cloudb-service</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

src/cloudb-service/Deveel.Data.Net/FileSystemBlockService.cs

@@ -235,14 +235,13 @@ public override void Complete() {
 
 		private class CompressionThread {
 			private readonly FileSystemBlockService service;
-			private readonly Thread thread;
 			private bool finished;
 			private bool hasFinished;
 
 			public CompressionThread(FileSystemBlockService service) {
 				this.service = service;
 
-				thread = new Thread(Execute);
+				var thread = new Thread(Execute);
 				thread.IsBackground = true;
 				thread.Name = "BlockService::Compression";
 				thread.Start();
@@ -267,7 +266,7 @@ private void Execute() {
 					lock (this) {
 
 						// Wait 2 seconds,
-						Monitor.Wait(2000);
+						Monitor.Wait(this, 2000);
 
 						// Any new block containers added, we need to process,
 						List<BlockContainer> newItems = new List<BlockContainer>();