From d43080bfd360c84fbcce15ba059376c6956bceb1 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Tue, 30 Sep 2014 14:07:35 -0300
Subject: [PATCH] FWK-192: Criação do CacheFilter na extensão REST

---
 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/CacheFilter.java | 12 +++++++++---
 impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml                   |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/CacheFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/CacheFilter.java
index 6ca8b1b..49c90c5 100644
--- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/CacheFilter.java
+++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/CacheFilter.java
@@ -56,15 +56,21 @@ public class CacheFilter implements Filter {
 	}
 
 	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
-			ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
 		if (response instanceof HttpServletResponse) {
-			((HttpServletResponse) response).setHeader("Cache-Control", value);
+			setCacheControl((HttpServletResponse) response);
 		}
 
 		chain.doFilter(request, response);
 	}
 
+	protected void setCacheControl(HttpServletResponse response) {
+		if (Strings.isEmpty(response.getHeader("Cache-Control"))) {
+			response.setHeader("Cache-Control", value);
+		}
+	}
+
 	@Override
 	public void destroy() {
 	}
diff --git a/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml
index 519cb25..e5cabbe 100644
--- a/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml
+++ b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml
@@ -35,7 +35,8 @@
  51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 -->
 <web-fragment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" version="3.0" id="demoiselle-servlet">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" version="3.0"
+	id="demoiselle-servlet">
 
 	<name>demoiselle_servlet</name>
 
--
libgit2 0.21.2