[Archive-access-cvs] SF.net SVN: archive-access:[2806] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback

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

Revision: 2806
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2806&view=rev
Author:   bradtofel
Date:     2009-10-15 22:32:38 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
BUGFIX(ACC-70): No longer explicitly set timezone for entire JVM to GMT, now GMT is specified at Calendar construction.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java	2009-10-15 22:27:18 UTC (rev 2805)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitioner.java	2009-10-15 22:32:38 UTC (rev 2806)
@@ -41,12 +41,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 Calendar.getInstance(TimeZone.getTimeZone("GMT"));		
 	}
 	
 	protected Calendar dateStrToCalendar(String dateStr) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java	2009-10-15 22:27:18 UTC (rev 2805)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/Timestamp.java	2009-10-15 22:32:38 UTC (rev 2806)
@@ -42,7 +42,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";
@@ -327,14 +327,14 @@
 		return finalDigits;
 	}
 	
-	private static String boundDigits(String input, String min, String max) {
-		String bounded = input;
-		if(input.compareTo(min) < 0) {
-			bounded = min;
-		} else if(input.compareTo(max) > 0) {
-			bounded = max;
+	private static String boundDigits(final String test, final String min, 
+			final String max) {
+		if(test.compareTo(min) < 0) {
+			return min;
+		} else if(test.compareTo(max) > 0) {
+			return max;
 		}
-		return bounded;
+		return test;
 	}
 	
 	// check each of YEAR, MONTH, DAY, HOUR, MINUTE, SECOND to make sure they

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java	2009-10-15 22:27:18 UTC (rev 2805)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java	2009-10-15 22:32:38 UTC (rev 2806)
@@ -60,7 +60,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.