Author: jdcasey
Date: Tue May 24 03:33:23 2011
New Revision: 1126855
URL: http://svn.apache.org/viewvc?rev=1126855&view=rev
Log:
fixing NPEs
Modified:
maven/maven-3/branches/mirror-group-routing/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/maven-3/branches/mirror-group-routing/maven-routem-aether-wagon-connector/src/main/java/org/apache/maven/router/repository/RoutingConnectorWrapper.java
maven/maven-3/branches/mirror-group-routing/maven-routem-api/src/main/java/org/apache/maven/artifact/router/ArtifactRouter.java
maven/maven-3/branches/mirror-group-routing/maven-routem-impl/pom.xml
maven/maven-3/branches/mirror-group-routing/maven-routem-impl/src/main/java/org/apache/maven/artifact/router/conf/FileRouterConfigBuilder.java
Modified:
maven/maven-3/branches/mirror-group-routing/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=1126855&r1=1126854&r2=1126855&view=diff
==============================================================================
---
maven/maven-3/branches/mirror-group-routing/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/maven-3/branches/mirror-group-routing/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Tue May 24 03:33:23 2011
@@ -937,7 +937,7 @@ public class MavenCli
userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
}
- routerConfig = new FileRouterConfigBuilder( DEFAULT_USER_EXT_CONF_DIR
).build();
+ routerConfig = new FileRouterConfigBuilder( DEFAULT_USER_EXT_CONF_DIR,
logger ).build();
if ( commandLine.hasOption( CLIManager.ROUTER_OPTIONS ) )
{
routerConfig.setOptions( ArtifactRouterOption.parse(
commandLine.getOptionValues( CLIManager.ROUTER_OPTIONS ) ) );
Modified:
maven/maven-3/branches/mirror-group-routing/maven-routem-aether-wagon-connector/src/main/java/org/apache/maven/router/repository/RoutingConnectorWrapper.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-routem-aether-wagon-connector/src/main/java/org/apache/maven/router/repository/RoutingConnectorWrapper.java?rev=1126855&r1=1126854&r2=1126855&view=diff
==============================================================================
---
maven/maven-3/branches/mirror-group-routing/maven-routem-aether-wagon-connector/src/main/java/org/apache/maven/router/repository/RoutingConnectorWrapper.java
(original)
+++
maven/maven-3/branches/mirror-group-routing/maven-routem-aether-wagon-connector/src/main/java/org/apache/maven/router/repository/RoutingConnectorWrapper.java
Tue May 24 03:33:23 2011
@@ -213,9 +213,13 @@ class RoutingConnectorWrapper
public synchronized void close()
{
Map<GroupRoute, RepositoryConnector> openConnectors =
getOpenConnectors();
- for ( RepositoryConnector connector : openConnectors.values() )
+ if ( openConnectors != null )
{
- connector.close();
+ for ( RepositoryConnector connector : openConnectors.values() )
+ {
+ connector.close();
+ }
+
}
setOpenConnectors( null );
Modified:
maven/maven-3/branches/mirror-group-routing/maven-routem-api/src/main/java/org/apache/maven/artifact/router/ArtifactRouter.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-routem-api/src/main/java/org/apache/maven/artifact/router/ArtifactRouter.java?rev=1126855&r1=1126854&r2=1126855&view=diff
==============================================================================
---
maven/maven-3/branches/mirror-group-routing/maven-routem-api/src/main/java/org/apache/maven/artifact/router/ArtifactRouter.java
(original)
+++
maven/maven-3/branches/mirror-group-routing/maven-routem-api/src/main/java/org/apache/maven/artifact/router/ArtifactRouter.java
Tue May 24 03:33:23 2011
@@ -50,9 +50,12 @@ public final class ArtifactRouter
public synchronized ArtifactRouter addMirrors( final
Collection<MirrorRoute> mirrors )
{
- for ( MirrorRoute route : mirrors )
+ if ( mirrors != null )
{
- addMirror( route );
+ for ( MirrorRoute route : mirrors )
+ {
+ addMirror( route );
+ }
}
return this;
@@ -60,6 +63,11 @@ public final class ArtifactRouter
public synchronized ArtifactRouter addMirror( final MirrorRoute mirror )
{
+ if ( mirror == null )
+ {
+ return this;
+ }
+
if ( !mirrors.contains( mirror ) )
{
mirrors.add( mirror );
@@ -87,9 +95,12 @@ public final class ArtifactRouter
public synchronized ArtifactRouter addGroups( final Collection<GroupRoute>
groups )
{
- for ( GroupRoute route : groups )
+ if ( groups != null )
{
- addGroup( route );
+ for ( GroupRoute route : groups )
+ {
+ addGroup( route );
+ }
}
return this;
@@ -97,6 +108,11 @@ public final class ArtifactRouter
public synchronized ArtifactRouter addGroup( final GroupRoute group )
{
+ if ( group == null )
+ {
+ return this;
+ }
+
GroupRoute toInsert = group;
List<GroupRoute> routes = new ArrayList<GroupRoute>( groups.values() );
Modified: maven/maven-3/branches/mirror-group-routing/maven-routem-impl/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-routem-impl/pom.xml?rev=1126855&r1=1126854&r2=1126855&view=diff
==============================================================================
--- maven/maven-3/branches/mirror-group-routing/maven-routem-impl/pom.xml
(original)
+++ maven/maven-3/branches/mirror-group-routing/maven-routem-impl/pom.xml Tue
May 24 03:33:23 2011
@@ -33,4 +33,17 @@
<artifactId>sisu-inject-plexus</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/maven-3/branches/mirror-group-routing/maven-routem-impl/src/main/java/org/apache/maven/artifact/router/conf/FileRouterConfigBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-routem-impl/src/main/java/org/apache/maven/artifact/router/conf/FileRouterConfigBuilder.java?rev=1126855&r1=1126854&r2=1126855&view=diff
==============================================================================
---
maven/maven-3/branches/mirror-group-routing/maven-routem-impl/src/main/java/org/apache/maven/artifact/router/conf/FileRouterConfigBuilder.java
(original)
+++
maven/maven-3/branches/mirror-group-routing/maven-routem-impl/src/main/java/org/apache/maven/artifact/router/conf/FileRouterConfigBuilder.java
Tue May 24 03:33:23 2011
@@ -32,7 +32,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-@Component( role = RouterConfigBuilder.class )
public class FileRouterConfigBuilder
implements RouterConfigBuilder
{
@@ -55,14 +54,14 @@ public class FileRouterConfigBuilder
private static final String CONFIG_FILENAME = "router.properties";
- @Requirement
private Logger logger;
private File confDir;
- public FileRouterConfigBuilder( File confDir )
+ public FileRouterConfigBuilder( File confDir, Logger logger )
{
this.confDir = confDir;
+ this.logger = logger;
}
public ArtifactRouterConfiguration build()
