浏览代码

jfinal 2.1 release ^_^

James 10 年之前
父节点
当前提交
d6cb044e0b
共有 1 个文件被更改,包括 5 次插入7 次删除
  1. 5 7
      src/com/jfinal/config/Routes.java

+ 5 - 7
src/com/jfinal/config/Routes.java

@@ -21,7 +21,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import com.jfinal.core.Controller;
-import com.jfinal.kit.StrKit;
 
 /**
  * Routes.
@@ -44,13 +43,12 @@ public abstract class Routes {
 			
 			for (Entry<String, Class<? extends Controller>> e : routes.map.entrySet()) {
 				String controllerKey = e.getKey();
-				Class<? extends Controller> controllerClass = e.getValue();
-				String viewPath = routes.getViewPath(controllerKey);
-				if (StrKit.notBlank(viewPath)) {
-					add(controllerKey, controllerClass, viewPath);
-				} else {
-					add(controllerKey, controllerClass);
+				if (this.map.containsKey(controllerKey)) {
+					throw new IllegalArgumentException("The controllerKey already exists: " + controllerKey); 
 				}
+				
+				this.map.put(controllerKey, e.getValue());
+				this.viewPathMap.put(controllerKey, routes.getViewPath(controllerKey));
 			}
 		}
 		return this;