From fd733f76f0e97972e056ed4e45cb3e45cd5b7913 Mon Sep 17 00:00:00 2001
From: Silviu Capota-Mera <silviucapota@hotmail.com>
Date: Sat, 7 Oct 2017 12:14:28 -0400
Subject: [PATCH] simplify replacement of the base (root) tree

---
 app.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app.go b/app.go
index d2b492cd..b966fde4 100644
--- a/app.go
+++ b/app.go
@@ -225,7 +225,7 @@ func UnregisterFixedRoute(fixedRoute string, method string) *App {
 				continue
 			}
 			if BeeApp.Handlers.routers[m].prefix == strings.Trim(fixedRoute, "/ ") {
-				delete(BeeApp.Handlers.routers, m)
+				findAndRemoveSingleTree(BeeApp.Handlers.routers[m])
 				return BeeApp
 			}
 			findAndRemoveTree(subPaths, BeeApp.Handlers.routers[m], m)
@@ -236,7 +236,7 @@ func UnregisterFixedRoute(fixedRoute string, method string) *App {
 	um := strings.ToUpper(method)
 	if _, ok := BeeApp.Handlers.routers[um]; ok {
 		if BeeApp.Handlers.routers[um].prefix == strings.Trim(fixedRoute, "/ ") {
-			delete(BeeApp.Handlers.routers, um)
+			findAndRemoveSingleTree(BeeApp.Handlers.routers[um])
 			return BeeApp
 		}
 		findAndRemoveTree(subPaths, BeeApp.Handlers.routers[um], um)
@@ -272,6 +272,20 @@ func findAndRemoveTree(paths []string, entryPointTree *Tree, method string) {
 	}
 }
 
+func findAndRemoveSingleTree(entryPointTree *Tree) {
+
+	if len(entryPointTree.fixrouters) > 0 {
+		// Remove the *Tree from the fixrouters slice
+		entryPointTree.fixrouters[0] = nil
+		entryPointTree.fixrouters = entryPointTree.fixrouters[1:]
+	}
+
+	if len(entryPointTree.leaves) > 0 {
+		entryPointTree.leaves[0] = nil
+		entryPointTree.leaves = entryPointTree.leaves[1:]
+	}
+}
+
 // Include will generate router file in the router/xxx.go from the controller's comments
 // usage:
 // beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{})