[Archive-access-cvs] SF.net SVN: archive-access:[2762] branches/wayback-1_4_2/wayback-core/src/ main/java/org/archive/wayback

[<bra...@us...>]

Revision: 2762
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2762&view=rev
Author:   bradtofel
Date:     2009-07-17 23:22:42 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
BUGFIX(ACC-70) Now explicitly grabs a Calendar set with GMT timezone instead of setting JVM default timezone at startup.

Modified Paths:
--------------
    branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java
    branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java
    branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java

Modified: branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java
===================================================================
--- branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java	2009-07-17 23:19:41 UTC (rev 2761)
+++ branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java	2009-07-17 23:22:42 UTC (rev 2762)
@@ -26,7 +26,6 @@
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
 import org.archive.wayback.core.WaybackRequest;
@@ -41,12 +40,7 @@
 public abstract class ResultsPartitioner {
 	
 	protected Calendar getCalendar() {
-		String[] ids = TimeZone.getAvailableIDs(0);
-		if (ids.length < 1) {
-			return null;
-		}
-		TimeZone gmt = new SimpleTimeZone(0, ids[0]);
-		return new GregorianCalendar(gmt);		
+		return new GregorianCalendar(TimeZone.getTimeZone("gmt"));		
 	}
 	
 	protected Calendar dateStrToCalendar(String dateStr) {

Modified: branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java
===================================================================
--- branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java	2009-07-17 23:19:41 UTC (rev 2761)
+++ branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java	2009-07-17 23:22:42 UTC (rev 2762)
@@ -26,7 +26,6 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
 
@@ -42,7 +41,7 @@
 	private final static String UPPER_TIMESTAMP_LIMIT = "29991939295959";
 	private final static String YEAR_LOWER_LIMIT      = "1996";
 	private final static String YEAR_UPPER_LIMIT      = 
-		String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
+		String.valueOf(Calendar.getInstance(TimeZone.getTimeZone("gmt")).get(Calendar.YEAR));
 	private final static String MONTH_LOWER_LIMIT     = "01";
 	private final static String MONTH_UPPER_LIMIT     = "12";
 	private final static String DAY_LOWER_LIMIT       = "01";
@@ -256,12 +255,7 @@
 	}
 	
 	private static Calendar getCalendar() {
-		String[] ids = TimeZone.getAvailableIDs(0);
-		if (ids.length < 1) {
-			return null;
-		}
-		TimeZone gmt = new SimpleTimeZone(0, ids[0]);
-		return new GregorianCalendar(gmt);		
+		return new GregorianCalendar(TimeZone.getTimeZone("gmt"));		
 	}
 	
 	/**

Modified: branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java
===================================================================
--- branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java	2009-07-17 23:19:41 UTC (rev 2761)
+++ branches/wayback-1_4_2/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java	2009-07-17 23:22:42 UTC (rev 2762)
@@ -25,7 +25,6 @@
 package org.archive.wayback.webapp;
 
 import java.io.IOException;
-import java.util.TimeZone;
 import java.util.logging.Logger;
 
 import javax.servlet.Filter;
@@ -39,10 +38,6 @@
 
 import org.archive.wayback.exception.ConfigurationException;
 
-//import org.archive.wayback.core.WaybackRequest;
-//import org.archive.wayback.exception.BadQueryException;
-//import org.archive.wayback.exception.ConfigurationException;
-
 /**
  *
  *
@@ -60,7 +55,6 @@
 	public void init(FilterConfig config) throws ServletException {
 
 		LOGGER.info("Wayback Filter initializing...");
-		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
 		try {
 			mapper = new RequestMapper(config.getServletContext());
 		} catch (ConfigurationException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.