svn commit: r1028293 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java

[mir]

Author: mir
Date: Thu Oct 28 13:36:45 2010
New Revision: 1028293

URL: http://svn.apache.org/viewvc?rev=1028293&view=rev
Log:
CLEREZZA-344: cache control header added, if no cache control is set

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java?rev=1028293&r1=1028292&r2=1028293&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java
 Thu Oct 28 13:36:45 2010
@@ -41,7 +41,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
 
 import javax.activation.UnsupportedDataTypeException;
 import javax.security.auth.Subject;
@@ -297,6 +296,7 @@ class ResponseProcessor {
                                        @Override
                                        public void run() {
                                                try {
+                                                       
setDefaultCacheControlHeader(headerMap);
                                                        flushHeaders(headerMap, 
response);
                                                } catch (HandlerException ex) {
                                                        logger.error("Exception 
{}", ex.toString(), ex);
@@ -566,4 +566,13 @@ class ResponseProcessor {
                }
                return result;
        }
+
+       private static void setDefaultCacheControlHeader(MultivaluedMap<String, 
Object> headerMap) {
+               if (headerMap.containsKey(HeaderName.CACHE_CONTROL.toString()) 
||
+                               
headerMap.containsKey(HeaderName.EXPIRES.toString()) ||
+                               
headerMap.containsKey(HeaderName.PRAGMA.toString())) {
+                       return;
+               }
+               headerMap.putSingle(HeaderName.CACHE_CONTROL.toString(), 
"no-cache");
+       }
 }