Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Liptak2015-07-16 02:38:34 -0400
committerFred Bricon2015-08-18 17:04:33 -0400
commit59bd399506b9e53648efcafda93809e06fe8819f (patch)
treea3df677739008abf0562c95ca6dcaeba468ddfc5
parent0cf9ec6d67cb15d5844e040a561d16639a280739 (diff)
downloadm2e-core-59bd399506b9e53648efcafda93809e06fe8819f.tar.gz
m2e-core-59bd399506b9e53648efcafda93809e06fe8819f.tar.xz
m2e-core-59bd399506b9e53648efcafda93809e06fe8819f.zip
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>
-rw-r--r--org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java7
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 d9a90b18..50bfac4f 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
@@ -466,7 +466,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;
}

Back to the top