472726 - in case of empty resource folder location path project root is taken.

During checking if the resource folders are nested having the project root as
resource folder caused an illegalargumentexception.
Now if the reource folder location path is empty the check takes simply
the project root folder to prevent errors.

Change-Id: I55202c25361fc00945900e6c6959aaeaa65d2202
Signed-off-by: Gabor Liptak <gabor.liptak@gmail.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
index f0e366de..2835c6df 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
@@ -468,7 +468,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
 
   private boolean isContained(IPath fullpath, IProject project, IPath[] relativePathes) {
     for(IPath location : relativePathes) {
-      IPath expanded = project.getFolder(location).getFullPath();
+      IPath expanded = null;
+      if(location.isEmpty()) {
+        expanded = project.getFullPath();
+      } else {
+        expanded = project.getFolder(location).getFullPath();
+      }
       if(expanded.equals(fullpath)) {
         return true;
       }