diff options
author | slewis | 2007-10-29 01:53:49 +0000 |
---|---|---|
committer | slewis | 2007-10-29 01:53:49 +0000 |
commit | ad27c130b42c6cbfb0cb2c23906ee65d1ab9b105 (patch) | |
tree | 726882d1a85964642c118fd5a2596ddf55b73202 | |
parent | 074a02c1adc9fc26c12acbf014d3c2602485f43e (diff) | |
download | org.eclipse.ecf-ad27c130b42c6cbfb0cb2c23906ee65d1ab9b105.tar.gz org.eclipse.ecf-ad27c130b42c6cbfb0cb2c23906ee65d1ab9b105.tar.xz org.eclipse.ecf-ad27c130b42c6cbfb0cb2c23906ee65d1ab9b105.zip |
Fix for bug 207686
2 files changed, 3 insertions, 5 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF index eb83996cc..9983dcab6 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF @@ -15,6 +15,7 @@ Import-Package: org.apache.commons.httpclient, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.httpclient.protocol, + org.apache.commons.httpclient.util;version="3.0.1", org.eclipse.core.runtime.jobs, org.eclipse.osgi.util;version="1.0.0", org.osgi.framework;version="1.3.0", diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java index 912171fef..1225aed45 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java @@ -11,13 +11,12 @@ package org.eclipse.ecf.provider.filetransfer.httpclient; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Locale; import javax.security.auth.login.LoginException; import org.apache.commons.httpclient.*; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.commons.httpclient.util.DateUtil; import org.eclipse.core.runtime.Assert; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.security.*; @@ -38,8 +37,6 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer private static final String USERNAME_PREFIX = Messages.HttpClientRetrieveFileTransfer_Username_Prefix; - private static final SimpleDateFormat RFC1123 = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z", new Locale("en")); //$NON-NLS-1$ //$NON-NLS-2$ - protected static final int DEFAULT_CONNECTION_TIMEOUT = 30000; protected static final int HTTP_PORT = 80; @@ -214,7 +211,7 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer long lastModified = 0; if (lastModifiedString != null) { try { - lastModified = RFC1123.parse(lastModifiedString).getTime(); + lastModified = DateUtil.parseDate(lastModifiedString).getTime(); } catch (Exception e) { throw new IOException(Messages.HttpClientRetrieveFileTransfer_EXCEPITION_INVALID_LAST_MODIFIED_FROM_SERVER); } |