[jbosstools-commits] JBoss Tools SVN: r38377 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal/project/facet and 1 other directory.

Author: snjeza Date: 2012-02-01 16:05:44 -0500 (Wed, 01 Feb 2012) New Revision: 38377 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java Log: JBIDE-10673 NullPointerException when creating Dynamic Web Project with JSF Portlet facet and no targeted runtime Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java 2012-02-01 20:31:34 UTC (rev 38376) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java 2012-02-01 21:05:44 UTC (rev 38377) @@ -240,6 +240,9 @@ public String getFacesConfig(IProject project, IProgressMonitor monitor) { WebApp webApp = getWebApp(project, monitor); + if (webApp == null) { + return null; + } EList contextParams = webApp.getContextParams(); for (Iterator iterator = contextParams.iterator(); iterator.hasNext();) { Object paramObj = (Object) iterator.next(); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java 2012-02-01 20:31:34 UTC (rev 38376) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java 2012-02-01 21:05:44 UTC (rev 38377) @@ -253,6 +253,9 @@ public String getFacesConfig(IProject project, IProgressMonitor monitor) { WebApp webApp = getWebApp(project, monitor); + if (webApp == null) { + return null; + } List contextParams = webApp.getContextParams(); for (Iterator iterator = contextParams.iterator(); iterator.hasNext();) { Object paramObj = (Object) iterator.next(); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2012-02-01 20:31:34 UTC (rev 38376) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2012-02-01 21:05:44 UTC (rev 38377) @@ -544,7 +544,7 @@ } else { portletbridgeHome = new File(portletbridgeRuntime); } - if (!portletbridgeHome.exists()) { + if (portletbridgeHome == null || !portletbridgeHome.exists()) { PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_Portletbridge_Runtime); return; }