Author: scabanovich Date: 2011-10-20 15:23:53 -0400 (Thu, 20 Oct 2011) New Revision: 35861 Modified: branches/jbosstools-3.3.0.M4/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java Log: JBIDE-9951 https://issues.jboss.org/browse/JBIDE-9951 Null pointer fixed. Merge to 3.3.0.M4 Modified: branches/jbosstools-3.3.0.M4/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- branches/jbosstools-3.3.0.M4/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-10-20 19:10:33 UTC (rev 35860) +++ branches/jbosstools-3.3.0.M4/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-10-20 19:23:53 UTC (rev 35861) @@ -876,19 +876,19 @@ } } } - } - for (IProject p: ResourcesPlugin.getWorkspace().getRoot().getProjects()) { - if(p.isAccessible()) { - CDICorePlugin.getCDI(p, true); + for (IProject p: ResourcesPlugin.getWorkspace().getRoot().getProjects()) { + if(p.isAccessible()) { + CDICorePlugin.getCDI(p, true); + } } - } - CDICoreNature[] ns = getNature().getAllDependentProjects(); - for (CDICoreNature n: ns) { - if(n.getDelegate() instanceof CDIProject) { - CDIProject p = (CDIProject)n.getDelegate(); - for (IBean b: p.getDeclaredBeans()) { - if(b instanceof IClassBean) { - collectObserverMethods((IClassBean)b, eventType, injectionPoint, result); + CDICoreNature[] ns = getNature().getAllDependentProjects(); + for (CDICoreNature n: ns) { + if(n.getDelegate() instanceof CDIProject) { + CDIProject p = (CDIProject)n.getDelegate(); + for (IBean b: p.getDeclaredBeans()) { + if(b instanceof IClassBean) { + collectObserverMethods((IClassBean)b, eventType, injectionPoint, result); + } } } } @@ -907,7 +907,7 @@ result.add(m); } } - } + } } /**