Refactored FdbNativeCluster.CreateClusterAsync to return just the cluster handler

Author: KrzysFR

FoundationDB.Client/Fdb.cs

@@ -455,7 +455,7 @@ public static async Task<IFdbCluster> CreateClusterAsync(string clusterFile, Can
 			return await CreateClusterInternalAsync(clusterFile, cancellationToken).ConfigureAwait(false);
 		}
 
-		internal static Task<FdbCluster> CreateClusterInternalAsync(string clusterFile, CancellationToken cancellationToken)
+		internal static async Task<FdbCluster> CreateClusterInternalAsync(string clusterFile, CancellationToken cancellationToken)
 		{
 			EnsureIsStarted();
 
@@ -469,7 +469,8 @@ internal static Task<FdbCluster> CreateClusterInternalAsync(string clusterFile,
 			//TODO: check the path ? (exists, readable, ...)
 
 			//TODO: have a way to configure the default IFdbClusterHander !
-			return FdbNativeCluster.CreateClusterAsync(clusterFile, cancellationToken);
+			var handler = await FdbNativeCluster.CreateClusterAsync(clusterFile, cancellationToken).ConfigureAwait(false);
+			return new FdbCluster(handler, clusterFile);
 		}
 
 		#endregion

FoundationDB.Client/Native/FdbNativeCluster.cs

@@ -1,5 +1,5 @@
 #region BSD Licence
-/* Copyright (c) 2013-2014, Doxense SAS
+/* Copyright (c) 2013-2015, Doxense SAS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ public FdbNativeCluster(ClusterHandle handle)
 			m_handle = handle;
 		}
 
-		public static Task<FdbCluster> CreateClusterAsync(string clusterFile, CancellationToken cancellationToken)
+		public static Task<IFdbClusterHandler> CreateClusterAsync(string clusterFile, CancellationToken cancellationToken)
 		{
 			var future = FdbNative.CreateCluster(clusterFile);
 			return FdbFuture.CreateTaskFromHandle(future,
@@ -60,7 +60,8 @@ public static Task<FdbCluster> CreateClusterAsync(string clusterFile, Cancellati
 						cluster.Dispose();
 						throw Fdb.MapToException(err);
 					}
-					return new FdbCluster(new FdbNativeCluster(cluster), clusterFile);
+					var handler = new FdbNativeCluster(cluster);
+					return (IFdbClusterHandler) handler;
 				},
 				cancellationToken
 			);
@@ -108,7 +109,8 @@ public Task<IFdbDatabaseHandler> OpenDatabaseAsync(string databaseName, Cancella
 						database.Dispose();
 						throw Fdb.MapToException(err);
 					}
-					return (IFdbDatabaseHandler) new FdbNativeDatabase(database);
+					var handler = new FdbNativeDatabase(database);
+                    return (IFdbDatabaseHandler) handler;
 				},
 				cancellationToken
 			);