Permalink
Browse files

format and serialization directives in request take precedence

  • Loading branch information...
1 parent 0b1a0df commit 691ce585d0a10cf9206da58213b3674449d3a2c6 @duck1123 duck1123 committed Oct 9, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/ciste/routes.clj
View
@@ -156,13 +156,13 @@ Returns either a (possibly modified) request map if successful, or nil."
(do
(log/debug "match found")
(let [format (or (keyword (:format (:params request)))
- format (:format request))
- serialization (or serialization (:serialization request))
- request (merge request
- {:format format
- :action action
- :serialization serialization})]
- (invoke-action request)))))
+ (:format request) format)
+ serialization (or serialization (:serialization request))
+ request (merge request
+ {:format format
+ :action action
+ :serialization serialization})]
+ (invoke-action request)))))
(defn resolve-routes
"Returns a handler fn that will match each route against

0 comments on commit 691ce58

Please sign in to comment.