reverted router multiple routes

Author: lmajano

.cfconfig.json

@@ -17,7 +17,7 @@
             "host": "localhost",
             "dbdriver": "MySQL",
             "password": "${DB_PASSWORD}",
-            "dsn": "jdbc:mysql://localhost:3306/coolblog?tinyInt1isBit=false&useSSL=false",
+            "dsn": "${DB_CONNECTIONSTRING}",
             "custom": "",
             "username": "${DB_USER:root}",
             "database": "coolblog",

.travis.yml

@@ -8,7 +8,7 @@ notifications:
 env:
   global:
     # TARGET RELEASE VERSION: BUMP AS NEEDED
-    - COLDBOX_VERSION=5.7.0
+    - COLDBOX_VERSION=5.6.1
   matrix:
     - ENGINE=lucee@4.5 ANT_TARGET=build.all
     - ENGINE=lucee@5 ANT_TARGET=run-tests

system/web/routing/Router.cfc

@@ -765,28 +765,29 @@ component accessors="true" extends="coldbox.system.FrameworkSupertype" threadsaf
         }
 
         // Check for existing route matches
-        var matchingRoutes = variables.routes.filter( function( route ) {
-            return route.pattern == thisRoute.pattern &&
-                route.domain == thisRoute.domain;
-        } );
-        if ( ! matchingRoutes.isEmpty() ) {
-            var matchingRoute = matchingRoutes[ 1 ];
-            // collect action:
-            var actions = {};
-            var matchingActions = isStruct( matchingRoute.action ) ? matchingRoute.action : {};
-            structAppend( actions, matchingActions, true );
-            for ( var verb in matchingRoute.verbs ) {
-                structInsert( actions, verb, matchingRoute.event );
-            }
-            var thisRouteActions = isStruct( thisRoute.action ) ? thisRoute.action : {};
-            structAppend( actions, thisRouteActions, true );
-            for ( var verb in thisRoute.verbs ) {
-                structInsert( actions, verb, thisRoute.event );
-            }
-            matchingRoute.action = actions;
-            matchingRoute.verbs = "";
-            return this;
-        }
+        // var matchingRoutes = variables.routes.filter( function( route ) {
+        //     return route.pattern == thisRoute.pattern &&
+        //         route.domain == thisRoute.domain;
+		// } );
+        // if ( ! matchingRoutes.isEmpty() ) {
+		// 	writeDump( var=matchingRoutes );abort;
+        //     var matchingRoute = matchingRoutes[ 1 ];
+        //     // collect action:
+        //     var actions = {};
+        //     var matchingActions = isStruct( matchingRoute.action ) ? matchingRoute.action : {};
+        //     structAppend( actions, matchingActions, true );
+        //     for ( var verb in matchingRoute.verbs ) {
+        //         structInsert( actions, verb, matchingRoute.event );
+        //     }
+        //     var thisRouteActions = isStruct( thisRoute.action ) ? thisRoute.action : {};
+        //     structAppend( actions, thisRouteActions, true );
+        //     for ( var verb in thisRoute.verbs ) {
+        //         structInsert( actions, verb, thisRoute.event );
+        //     }
+        //     matchingRoute.action = actions;
+        //     matchingRoute.verbs = "";
+        //     return this;
+        // }
 
 		// Check if we have optional args by looking for a ?
 		if( findnocase( "?", thisRoute.pattern ) AND NOT findNoCase( "regex:", thisRoute.pattern ) ){