diff options
| author | itrimble | 2010-03-30 02:16:06 +0000 |
|---|---|---|
| committer | itrimble | 2010-03-30 02:16:06 +0000 |
| commit | b9403f89a506af9bea3e66a8e9ab7ed72bf3e662 (patch) | |
| tree | 75e85b23d95c21421069f1c27e887904199b1c9a | |
| parent | 18bd64700341eb68efd393206def84ec4ce943ce (diff) | |
| download | webtools.jsf-b9403f89a506af9bea3e66a8e9ab7ed72bf3e662.tar.gz webtools.jsf-b9403f89a506af9bea3e66a8e9ab7ed72bf3e662.tar.xz webtools.jsf-b9403f89a506af9bea3e66a8e9ab7ed72bf3e662.zip | |
Bug 289349 - [WPE] NPE in WebrootUtil.getWebContentPath() method
| -rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java index ff65eeba7..3a99bf308 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.Set; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -27,6 +28,8 @@ import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jst.jsf.common.ui.IFileFolderConstants; import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin; import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -81,7 +84,16 @@ public class WebrootUtil { */ public static IPath getWebContentPath(IProject project) { if (project != null) { - return ComponentCore.createComponent(project).getRootFolder().getUnderlyingFolder().getFullPath(); + IVirtualComponent component = ComponentCore.createComponent(project); + if (component != null) { + IVirtualFolder rootFolder = component.getRootFolder(); + if (rootFolder != null) { + IContainer underlyingFolder = rootFolder.getUnderlyingFolder(); + if (underlyingFolder != null) { + return underlyingFolder.getFullPath(); + } + } + } } return null; } |