Remove simple compilation warning

play2war · Jan 14, 2017 · d394954 · d394954
1 parent 04d2d54
commit d394954
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/project-code/core/common/src/main/scala/play/core/server/servlet/RequestHandler.scala b/project-code/core/common/src/main/scala/play/core/server/servlet/RequestHandler.scala
@@ -318,7 +318,7 @@ abstract class Play2GenericServletRequestHandler(val servletRequest: HttpServlet
 
       val flashCookie = {
         header.headers.get(HeaderNames.SET_COOKIE)
-          .map(Cookies.decode)
+          .map(Cookies.decodeSetCookieHeader)
           .flatMap(_.find(_.name == Flash.COOKIE_NAME)).orElse {
             Option(requestHeader.flash).filterNot(_.isEmpty).map { _ =>
               Flash.discard.toCookie
@@ -327,7 +327,7 @@ abstract class Play2GenericServletRequestHandler(val servletRequest: HttpServlet
       }
 
       flashCookie.fold(result) { newCookie =>
-        result.withHeaders(HeaderNames.SET_COOKIE -> Cookies.merge(header.headers.getOrElse(HeaderNames.SET_COOKIE, ""), Seq(newCookie)))
+        result.withHeaders(HeaderNames.SET_COOKIE -> Cookies.mergeSetCookieHeader(header.headers.getOrElse(HeaderNames.SET_COOKIE, ""), Seq(newCookie)))
       }
     }