[exo-jcr-commits] exo-jcr SVN: r2696 - in jcr/branches/1.12.x/exo.jcr.component.webdav/src: test/java/org/exoplatform/services/jcr/webdav/ext and 1 other directory.

[do-not-reply at jboss.org]

Author: dkatayev
Date: 2010-06-24 10:59:24 -0400 (Thu, 24 Jun 2010)
New Revision: 2696

Modified:
   jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
   jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/ext/TestCaching.java
Log:
EXOJCR-774 Test failing with Unparseable date Exception fixed

Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java	2010-06-24 10:24:59 UTC (rev 2695)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java	2010-06-24 14:59:24 UTC (rev 2696)
@@ -48,6 +48,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
@@ -131,7 +132,7 @@
             // check before any other reads
             if (ifModifiedSince != null) 
             {
-               DateFormat dateFormat = new SimpleDateFormat(WebDavConst.DateFormat.IF_MODIFIED_SINCE_PATTERN);
+               DateFormat dateFormat = new SimpleDateFormat(WebDavConst.DateFormat.IF_MODIFIED_SINCE_PATTERN, Locale.US);
                Date lastModifiedDate = dateFormat.parse(lastModifiedProperty.getValue());
                
                dateFormat = new SimpleDateFormat(WebDavConst.DateFormat.MODIFICATION);

Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/ext/TestCaching.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/ext/TestCaching.java	2010-06-24 10:24:59 UTC (rev 2695)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/ext/TestCaching.java	2010-06-24 14:59:24 UTC (rev 2696)
@@ -94,7 +94,7 @@
       
       assertEquals(HTTPStatus.NOT_MODIFIED, response.getStatus());
    }
-
+   
    public void testCacheConf() throws Exception
    {
       ArrayList<CacheControlType> testValues = new ArrayList<CacheControlType>();