Permalink
Browse files

Merge branch '2.2.x_2.9' into 2.2.x_2.10

  • Loading branch information...
2 parents e4f4dd3 + 1f43516 commit 02238426a947f2285f1e0a4874b086f03b5b338c @casualjim casualjim committed Feb 14, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 json/src/main/scala/org/scalatra/json/JsonSupport.scala
@@ -66,7 +66,7 @@ trait JsonSupport[T] extends JsonOutput[T] {
}
}
- private def shouldParseBody(fmt: String) =
+ private def shouldParseBody(fmt: String)(implicit request: HttpServletRequest) =
(fmt == "json" || fmt == "xml") && parsedBody == JNothing
def parsedBody(implicit request: HttpServletRequest): JValue = request.get(ParsedBodyKey).map(_.asInstanceOf[JValue]) getOrElse {

0 comments on commit 0223842

Please sign in to comment.