Author: rob.stryker(a)jboss.com Date: 2012-04-24 05:49:21 -0400 (Tue, 24 Apr 2012) New Revision: 40446 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java Log: JBIDE-11593 - null protections Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-04-24 09:42:39 UTC (rev 40445) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-04-24 09:49:21 UTC (rev 40446) @@ -209,25 +209,23 @@ * include and exclude patterns in the virtual component metadata? * * Return the includes / excludes pattern if yes. - * If no, return null + * If no, return a two-length array of null objects * * @param module * @return */ private static String[] getProjectIncludesExcludes(IModule module) { IProject p = module.getProject(); - if( p == null ) - return new String[]{null, null}; - - IVirtualComponent vc = ComponentCore.createComponent(p); - Properties props = vc.getMetaProperties(); - String exclusionPatterns = getPatternValue(props, COMPONENT_EXCLUSIONS_PATTERN); - String inclusionPatterns = getPatternValue(props, COMPONENT_INCLUSIONS_PATTERN); - - return new String[]{ - inclusionPatterns, - exclusionPatterns - }; + if( p != null ) { + IVirtualComponent vc = ComponentCore.createComponent(p); + if( vc != null ) { + Properties props = vc.getMetaProperties(); + String exclusionPatterns = getPatternValue(props, COMPONENT_EXCLUSIONS_PATTERN); + String inclusionPatterns = getPatternValue(props, COMPONENT_INCLUSIONS_PATTERN); + return new String[]{ inclusionPatterns, exclusionPatterns }; + } + } + return new String[]{null, null}; } /**