Merge pull request #5 from chrislusf/master

merge seaweed master

1 files changed, 18 insertions, 12 deletions

diff --git a/weed/storage/volume.go b/weed/storage/volume.go
index afe3b4c8a..92839f9e6 100644
--- a/weed/storage/volume.go
+++ b/weed/storage/volume.go
@@ -90,51 +90,57 @@ func (v *Volume) FileStat() (datSize uint64, idxSize uint64, modTime time.Time)
 func (v *Volume) ContentSize() uint64 {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return v.nm.ContentSize()
 }
 
 func (v *Volume) DeletedSize() uint64 {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return v.nm.DeletedSize()
 }
 
 func (v *Volume) FileCount() uint64 {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return uint64(v.nm.FileCount())
 }
 
 func (v *Volume) DeletedCount() uint64 {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return uint64(v.nm.DeletedCount())
 }
 
 func (v *Volume) MaxFileKey() types.NeedleId {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return v.nm.MaxFileKey()
 }
 
 func (v *Volume) IndexFileSize() uint64 {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
+	if v.nm == nil {
+		return 0
+	}
 	return v.nm.IndexFileSize()
 }
 
-func (v *Volume) IndexFileContent() ([]byte, error) {
-	v.dataFileAccessLock.Lock()
-	defer v.dataFileAccessLock.Unlock()
-	return v.nm.IndexFileContent()
-}
-
-func (v *Volume) IndexFileName() string {
-	v.dataFileAccessLock.Lock()
-	defer v.dataFileAccessLock.Unlock()
-	return v.nm.IndexFileName()
-}
-
 // Close cleanly shuts down this volume
 func (v *Volume) Close() {
 	v.dataFileAccessLock.Lock()