Author: olamy
Date: Sun Sep 18 15:19:43 2011
New Revision: 1172293
URL: http://svn.apache.org/viewvc?rev=1172293&view=rev
Log:
don't add / if repo url already finish with : fix it in core test
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1172293&r1=1172292&r2=1172293&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
Sun Sep 18 15:19:43 2011
@@ -581,7 +581,7 @@ public abstract class AbstractHttpClient
public boolean resourceExists( String resourceName )
throws TransferFailedException, AuthorizationException
{
- String url = getRepository().getUrl() + "/" + resourceName;
+ String url = getRepository().getUrl() + (
repository.getUrl().endsWith( "/" ) ? "" : "/" ) + resourceName;
HttpHead headMethod = new HttpHead( url );
HttpResponse response = null;
int statusCode;
@@ -746,7 +746,7 @@ public abstract class AbstractHttpClient
{
Resource resource = inputData.getResource();
- String url = getRepository().getUrl() + "/" + resource.getName();
+ String url = getRepository().getUrl() + (
repository.getUrl().endsWith( "/" ) ? "" : "/" ) + resource.getName();
getMethod = new HttpGet( url );
long timestamp = resource.getLastModified();
if ( timestamp > 0 )
