Author: jdcasey
Date: Tue Jul 26 08:00:36 2005
New Revision: 225321
URL: http://svn.apache.org/viewcvs?rev=225321&view=rev
Log:
Adding null checks for lists of artifacts before mapping them...now methods
will simply return empty Map instances if null lists are passed in.
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=225321&r1=225320&r2=225321&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
Tue Jul 26 08:00:36 2005
@@ -53,12 +53,15 @@
public static Map artifactMapByVersionlessId( Collection artifacts )
{
Map artifactMap = new HashMap();
-
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+
+ if ( artifacts != null )
{
- Artifact artifact = (Artifact) it.next();
+ for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+ {
+ Artifact artifact = (Artifact) it.next();
- artifactMap.put( versionlessKey( artifact ), artifact );
+ artifactMap.put( versionlessKey( artifact ), artifact );
+ }
}
return artifactMap;
@@ -68,11 +71,14 @@
{
Map artifactMap = new HashMap();
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+ if ( artifacts != null )
{
- Artifact artifact = (Artifact) it.next();
+ for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+ {
+ Artifact artifact = (Artifact) it.next();
- artifactMap.put( artifact.getId(), artifact );
+ artifactMap.put( artifact.getId(), artifact );
+ }
}
return artifactMap;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
