Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-02-22 15:41:46 +0000
committerPascal Rapicault2011-02-23 02:22:33 +0000
commit37025615d813ce7d0d7fd6e4333b8691696ebefe (patch)
treee54418b456505b50bee3d3dee366ad0b500d6719 /org.eclipse.m2e.refactoring/src/org
parent904e9d5bdbb77db7a686ac8d6b36d10219f7aa3c (diff)
downloadm2e-core-37025615d813ce7d0d7fd6e4333b8691696ebefe.tar.gz
m2e-core-37025615d813ce7d0d7fd6e4333b8691696ebefe.tar.xz
m2e-core-37025615d813ce7d0d7fd6e4333b8691696ebefe.zip
Bug 336580 - Removed exception thrown by operations, added null check to refactoring
Diffstat (limited to 'org.eclipse.m2e.refactoring/src/org')
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java
index 4afbb7c3..ff6e712c 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java
@@ -186,11 +186,13 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring {
MavenProject project = MavenPlugin.getDefault().getMaven()
.resolveParentProject(request, projectFacade.getMavenProject(pm), pm);
pm.worked(1);
- IMavenProjectFacade parentFacade = getMavenProjectFacade(project);
- if(parentFacade != null) {
- hierarchy.add(parentFacade.getPom());
- gatherDescendants(parentFacade, projectManager, pm);
- gatherAncestors(parentFacade, projectManager, pm);
+ if(project != null) {
+ IMavenProjectFacade parentFacade = getMavenProjectFacade(project);
+ if(parentFacade != null) {
+ hierarchy.add(parentFacade.getPom());
+ gatherDescendants(parentFacade, projectManager, pm);
+ gatherAncestors(parentFacade, projectManager, pm);
+ }
}
}

Back to the top