Author: dkulp
Date: Tue Feb  4 20:25:35 2014
New Revision: 1564466

URL: http://svn.apache.org/r1564466
Log:
Merged revisions 1564454 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1564454 | dkulp | 2014-02-04 15:06:05 -0500 (Tue, 04 Feb 2014) | 2 lines

  Make sure the GMT timezone is used if the format is going to mandate that.

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java?rev=1564466&r1=1564465&r2=1564466&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
 Tue Feb  4 20:25:35 2014
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.EntityTag;
@@ -53,6 +54,8 @@ public class EvaluatePreconditionsTest {
     public void setUp() {
         service = new SimpleService();
         service.setEntityTag(ETAG_OLD);
+        DATE_FMT_822.setTimeZone(TimeZone.getTimeZone("GMT"));
+        
         service.setLastModified(DATE_OLD);
     }
 


Reply via email to