RavenDB-4739 DefaultFileSystem can be null or we should throw earlier (…

…#3927)
ayende · Jul 4, 2016 · a5d0429 · a5d0429
1 parent 8c4494a
commit a5d0429
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Raven.Client.Lightweight/FileSystem/FilesStore.cs b/Raven.Client.Lightweight/FileSystem/FilesStore.cs
@@ -126,7 +126,19 @@ public virtual HttpJsonRequestFactory JsonRequestFactory
             }
         }
 
-        public string DefaultFileSystem { get; set; }
+        public string DefaultFileSystem
+        {
+            get { return defaultFileSystem; }
+            set
+            { 
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("DefaultFileSystem can not be null or empty");
+                defaultFileSystem = value;
+            }
+        }
+
+        private string defaultFileSystem;
+
         private bool disableReplicationInformerGeneration = false;
         public IFilesReplicationInformer GetReplicationInformerForFileSystem(string fsName = null)
         {

diff --git a/Raven.Tests.FileSystem/ClientApi/FileSessionTests.cs b/Raven.Tests.FileSystem/ClientApi/FileSessionTests.cs
@@ -867,5 +867,19 @@ public async Task ShouldNotAttemptToLoadAlreadyDeletedFile()
                 }
             }
         }
+
+        [Fact]
+        public void DefaultFileSystemCannotBeEmptyOrNull()
+        {
+            Assert.Throws<ArgumentException>(() => new FilesStore
+            {
+                DefaultFileSystem = null
+            });
+
+            Assert.Throws<ArgumentException>(() => new FilesStore
+            {
+                DefaultFileSystem = ""
+            });
+        }
     }
 }