Improve the solution for #382

pippo-java · Sep 19, 2017 · c318aaa · c318aaa
1 parent d4230ea
commit c318aaa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pippo-core/src/main/java/ro/pippo/core/Response.java b/pippo-core/src/main/java/ro/pippo/core/Response.java
@@ -718,9 +718,9 @@ public Response contentLength(long length) {
      * @return the content type
      */
     public String getContentType() {
-        String contentType = httpServletResponse.getContentType();
+        String contentType = getHeader(HttpConstants.Header.CONTENT_TYPE);
         if (contentType == null) {
-            contentType = getHeader(HttpConstants.Header.CONTENT_TYPE);
+            contentType = httpServletResponse.getContentType();
         }
 
         return contentType;
@@ -735,8 +735,8 @@ public String getContentType() {
     public Response contentType(String contentType) {
         checkCommitted();
 
-        httpServletResponse.setContentType(contentType);
         header(HttpConstants.Header.CONTENT_TYPE, contentType);
+        httpServletResponse.setContentType(contentType);
 
         return this;
     }