[jbosstools-commits] JBoss Tools SVN: r34059 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: validation and 1 other directory.
Author: scabanovich
Date: 2011-08-18 12:40:46 -0400 (Thu, 18 Aug 2011)
New Revision: 34059
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-6517
https://issues.jboss.org/browse/JBIDE-6517
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-18
16:11:49 UTC (rev 34058)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-18
16:40:46 UTC (rev 34059)
@@ -523,7 +523,7 @@
if (ps != null) for (IMemberValuePair p: ps) {
String n = p.getMemberName();
Object o = d.getMemberValue(n);
- values.put(n, o.toString());
+ values.put(n, o == null ? "" : o.toString());
}
for (IMethod m: ms) {
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-18
16:11:49 UTC (rev 34058)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-18
16:40:46 UTC (rev 34059)
@@ -1959,7 +1959,7 @@
IAnnotationDeclaration target =
binding.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target!=null) {
Object value = target.getMemberValue(null);
- if(value != null && value instanceof Object[]) {
+ if(value instanceof Object[]) {
Object[] values = (Object[]) value;
if(values.length>1) {
Set<IBeanMethod> methods = interceptor.getAllMethods();