Changeset 353

Timestamp:

08/25/08 12:55:42 (3 months ago)

Author:

arneke

Message:

Using synchronized code to set expiration header instead of creating new objects all the time. May want an object pool for this.

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/util/ServletUtils.java (modified) (2 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/util/ServletUtils.java

@@ -34 +34 @@
 
 public class ServletUtils {
+    // Calendar objects are unfortunately expensive and not
+    // thread safe :(
+    static private Calendar calendar = new GregorianCalendar();
+    static private TimeZone timeZone = TimeZone.getTimeZone("GMT");
+    static private SimpleDateFormat format = null;
+     
+    
     /**
      * Case insensitive lookup
@@ -207 +214 @@
 
     /**
-     * Makes HTTP Expire header vaulue
-     *  
+     * Makes HTTP Expire header value
+     * 
+     * Has to be synchronized due to the shared Calendar objects
+     * 
      * @param seconds
      * @return
      */
-    public static String makeExpiresHeader(int seconds) {
-        SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
-        TimeZone timeZone = TimeZone.getTimeZone("GMT");
-        format.setTimeZone(timeZone);
-        Calendar calendar = new GregorianCalendar(); 
+    public static synchronized String makeExpiresHeader(int seconds) {
+        if(ServletUtils.format == null) {
+            ServletUtils.format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+            ServletUtils.format.setTimeZone(ServletUtils.timeZone);
+        }
         
         calendar.setTimeInMillis(System.currentTimeMillis() + seconds*1000);