Keep old params around only if its a cascade

pixeltrix · May 18, 2011 · 3490843 · 3490843
1 parent 43ff977
commit 3490843
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/rack/mount/route_set.rb b/lib/rack/mount/route_set.rb
@@ -146,14 +146,15 @@ def call(env)
           env[Prefix::KEY] = matches[:path_info].to_s
         end
 
-        begin
-          old_params = env[@parameters_key]
-          env[@parameters_key] = (old_params || {}).merge(params)
+        old_params = env[@parameters_key]
+        env[@parameters_key] = (old_params || {}).merge(params)
 
-          result = route.app.call(env)
-          return result unless result[1][X_CASCADE] == PASS
-        ensure
+        result = route.app.call(env)
+
+        if result[1][X_CASCADE] == PASS
           env[@parameters_key] = old_params
+        else
+          return result
         end
       end