Repository: archiva Updated Branches: refs/heads/master f23b74ade -> 99117364b
simplify varargs calls Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4444ed0e Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4444ed0e Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4444ed0e Branch: refs/heads/master Commit: 4444ed0e1dd2a21682faca057ccdbb4e819bc16f Parents: f23b74a Author: Eric Barboni <[email protected]> Authored: Fri Apr 11 23:16:01 2014 +0200 Committer: Eric Barboni <[email protected]> Committed: Fri Apr 11 23:16:01 2014 +0200 ---------------------------------------------------------------------- .../apache/archiva/common/plexusbridge/PlexusSisuBridge.java | 2 +- .../org/apache/archiva/proxy/common/DefaultWagonFactory.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/4444ed0e/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java index d28b449..257b216 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java @@ -122,7 +122,7 @@ public class PlexusSisuBridge Method method = classLoader.getClass().getMethod( "getURLs", new Class[]{ } ); if ( method != null ) { - return (URL[]) method.invoke( classLoader, null ); + return (URL[]) method.invoke( classLoader ); } } catch ( Exception e ) http://git-wip-us.apache.org/repos/asf/archiva/blob/4444ed0e/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java old mode 100755 new mode 100644 index da58f1c..4174350 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java @@ -53,6 +53,7 @@ public class DefaultWagonFactory this.applicationContext = applicationContext; } + @Override public Wagon getWagon( WagonFactoryRequest wagonFactoryRequest ) throws WagonFactoryException { @@ -85,9 +86,9 @@ public class DefaultWagonFactory try { Class clazz = wagon.getClass(); - Method getHttpHeaders = clazz.getMethod( "getHttpHeaders", null ); + Method getHttpHeaders = clazz.getMethod( "getHttpHeaders" ); - Properties headers = (Properties) getHttpHeaders.invoke( wagon, null ); + Properties headers = (Properties) getHttpHeaders.invoke( wagon ); if ( headers == null ) { headers = new Properties();
