summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/implementation-java/src
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-08-18 18:25:13 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-08-18 18:25:13 +0000
commit6ca90590da928bbb049b782623cd727defb53fdb (patch)
tree4acabdb49cba93912a260ae2ad814a8e1677989c /sca-java-2.x/trunk/modules/implementation-java/src
parent70a0f520fa3cc733043ddaab60ed89d936b05733 (diff)
Check if superClass is not null to avoid NPE
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@986835 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/implementation-java/src')
-rw-r--r--sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 9ad7e8f7a9..5c0e2c1397 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
@@ -47,7 +47,7 @@ public class EagerInitProcessor extends BaseJavaClassVisitor {
EagerInit annotation = clazz.getAnnotation(EagerInit.class);
if (annotation == null) {
Class<?> superClass = clazz.getSuperclass();
- while (!Object.class.equals(superClass)) {
+ while (superClass != null && !Object.class.equals(superClass)) {
annotation = superClass.getAnnotation(EagerInit.class);
if (annotation != null) {
break;