From e088fd512295048f3caec62f1dd2cd4d1a6b4d54 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 20 Apr 2011 21:46:59 +0000
Subject: Apply patch from Nitya for TUSCANY-3862. Thank you.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1095525 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'maven-plugins')

diff --git a/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java b/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
index 7c072a6b5c..c565030ed8 100644
--- a/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
+++ b/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
@@ -107,7 +107,8 @@ public class ClassConflictsDetectorMojo extends AbstractMojo {
                 continue;
             }
             if (artifact.isResolved()) {
-                if ("jar".equals(artifact.getType())) {
+                //Check if artifact is a jar & actually points to a file
+                if ("jar".equals(artifact.getType()) && (artifact.getFile() != null && artifact.getFile().isFile())) {
                     files.add(artifact.getFile());
                 }
             }
-- 
cgit v1.2.3