Author: scabanovich Date: 2011-09-23 16:19:50 -0400 (Fri, 23 Sep 2011) New Revision: 35013 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java Log: Check for null added before invoking addAnnotation method. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-23 19:00:23 UTC (rev 35012) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-23 20:19:50 UTC (rev 35013) @@ -148,7 +148,10 @@ } AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME); f.removeAnnotation(gd); - f.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext()); + IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject()); + if(ja != null) { + f.addAnnotation(ja, context.getRootContext()); + } } } @@ -167,7 +170,10 @@ AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME); if(gd != null) { p.removeAnnotation(gd); - p.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext()); + IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject()); + if(ja != null) { + p.addAnnotation(ja, context.getRootContext()); + } } } }