From 634800b293c4fd4c9eb39d1c43ce313e261930bf Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 13 Jan 2013 09:34:35 +0000
Subject: [PATCH] Caching settings.

---
 .../gempukku/lotro/async/LotroHttpRequestHandler.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java
index 2cf5dee30..1905f440f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java
@@ -138,14 +138,12 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler {
     private Map<String, String> getHeadersForFile(Map<String, String> headers, File file) {
         Map<String, String> fileHeaders = new HashMap<String, String>(headers);
 
+        boolean disableCaching = false;
         boolean cache = false;
 
         String fileName = file.getName();
         String contentType;
         if (fileName.endsWith(".html")) {
-            fileHeaders.put(CACHE_CONTROL, "no-cache");
-            fileHeaders.put(PRAGMA, "no-cache");
-            fileHeaders.put(EXPIRES, String.valueOf(-1));
             contentType = "text/html; charset=UTF-8";
         } else if (fileName.endsWith(".js")) {
             contentType = "application/javascript; charset=UTF-8";
@@ -167,7 +165,11 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler {
             contentType = "application/octet-stream";
         }
 
-        if (cache) {
+        if (disableCaching) {
+            fileHeaders.put(CACHE_CONTROL, "no-cache");
+            fileHeaders.put(PRAGMA, "no-cache");
+            fileHeaders.put(EXPIRES, String.valueOf(-1));
+        } else if (cache) {
             SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
             long sixMonthsFromNow = System.currentTimeMillis()+SIX_MONTHS;
             fileHeaders.put(EXPIRES, dateFormat.format(new Date(sixMonthsFromNow)));