Merge pull request #13 from evan-gu/fileSystem

fix bug of deleting the root
etcd-io · Sep 15, 2013 · 36329e9 · 36329e9
2 parents e41ef9b + cd6ed3d
commit 36329e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/file_system/node.go b/file_system/node.go
@@ -76,7 +76,7 @@ func (n *Node) Remove(recursive bool, callback func(path string)) error {
 	if !n.IsDir() { // file node: key-value pair
 		_, name := path.Split(n.Path)
 
-		if n.Parent.Children[name] == n {
+		if n.Parent != nil && n.Parent.Children[name] == n {
 			// This is the only pointer to Node object
 			// Handled by garbage collector
 			delete(n.Parent.Children, name)
@@ -102,7 +102,7 @@ func (n *Node) Remove(recursive bool, callback func(path string)) error {
 
 	// delete self
 	_, name := path.Split(n.Path)
-	if n.Parent.Children[name] == n {
+	if n.Parent != nil && n.Parent.Children[name] == n {
 		delete(n.Parent.Children, name)
 
 		if callback != nil {