cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r701528 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
Date Fri, 03 Oct 2008 20:50:00 GMT
Author: dkulp
Date: Fri Oct  3 13:49:59 2008
New Revision: 701528

URL: http://svn.apache.org/viewvc?rev=701528&view=rev
Log:
Merged revisions 701316 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r701316 | cschneider | 2008-10-03 03:16:58 -0400 (Fri, 03 Oct 2008) | 1 line
  
  Fix for failed test with other locales
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  3 13:49:59 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,700507,700602
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,700507,700602,701316

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java?rev=701528&r1=701527&r2=701528&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
Fri Oct  3 13:49:59 2008
@@ -21,6 +21,7 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.MultivaluedMap;
@@ -87,7 +88,7 @@
     @Test
     public void testBeforeDate() throws Exception {
         metadata.putSingle("If-Modified-Since", "Sat, 29 Oct 1994 19:43:31 GMT");
-        Date serverDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
+        Date serverDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH)
             .parse("Sun, 29 Oct 1994 19:43:31 GMT");
         
         ResponseBuilder rb = 
@@ -99,7 +100,7 @@
     @Ignore
     public void testAfterDate() throws Exception {
         metadata.putSingle("If-Modified-Since", "Sat, 29 Oct 1994 19:43:31 GMT");
-        Date serverDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
+        Date serverDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH)
             .parse("Fri, 28 Oct 1994 19:43:31 GMT");
         
         



Mime
View raw message