Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cosmetic :-) 

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
olivier lamy 2016-09-27 08:40:37 +10:00
parent 85be2b77af
commit 229276f8d9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

@ -48,8 +48,8 @@ import org.apache.archiva.policies.urlcache.UrlFailureCache;
import org.apache.archiva.proxy.common.WagonFactory; import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.proxy.common.WagonFactoryException; import org.apache.archiva.proxy.common.WagonFactoryException;
import org.apache.archiva.proxy.common.WagonFactoryRequest; import org.apache.archiva.proxy.common.WagonFactoryRequest;
import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.proxy.model.ProxyConnector; import org.apache.archiva.proxy.model.ProxyConnector;
import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.proxy.model.RepositoryProxyConnectors; import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.components.registry.Registry;
import org.apache.archiva.redback.components.registry.RegistryListener; import org.apache.archiva.redback.components.registry.RegistryListener;
@ -90,7 +90,6 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -98,6 +97,7 @@ import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
/** /**
* DefaultRepositoryProxyConnectors * DefaultRepositoryProxyConnectors
@ -1184,12 +1184,13 @@ public class DefaultRepositoryProxyConnectors
} }
// Convert seconds to milliseconds // Convert seconds to milliseconds
int timeoutInMilliseconds = remoteRepository.getRepository().getTimeout() * 1000; long timeoutInMilliseconds = TimeUnit.MILLISECONDS.convert( remoteRepository.getRepository().getTimeout(), //
TimeUnit.SECONDS );
// Set timeout read and connect // Set timeout read and connect
// FIXME olamy having 2 config values // FIXME olamy having 2 config values
wagon.setReadTimeout( timeoutInMilliseconds ); wagon.setReadTimeout( (int) timeoutInMilliseconds );
wagon.setTimeout( timeoutInMilliseconds ); wagon.setTimeout( (int) timeoutInMilliseconds );
try try
{ {
@ -1263,9 +1264,10 @@ public class DefaultRepositoryProxyConnectors
@Override @Override
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{ {
if ( ConfigurationNames.isNetworkProxy( propertyName ) || ConfigurationNames.isManagedRepositories( if ( ConfigurationNames.isNetworkProxy( propertyName ) //
propertyName ) || ConfigurationNames.isRemoteRepositories( propertyName ) || ConfigurationNames.isManagedRepositories( propertyName ) //
|| ConfigurationNames.isProxyConnector( propertyName ) ) || ConfigurationNames.isRemoteRepositories( propertyName ) //
|| ConfigurationNames.isProxyConnector( propertyName ) ) //
{ {
initConnectorsAndNetworkProxies(); initConnectorsAndNetworkProxies();
} }