Author: chas
Date: Sat Mar 30 00:25:47 2013
New Revision: 1462680
URL: http://svn.apache.org/r1462680
Log:
Fix NullPointerException from incomplete resoltuion
Modified:
commons/sandbox/classscan/trunk/bcel/src/main/java/org/apache/commons/classscan/bcel/BcelClass.java
Modified: commons/sandbox/classscan/trunk/bcel/src/main/java/org/apache/commons/classscan/bcel/BcelClass.java
URL: http://svn.apache.org/viewvc/commons/sandbox/classscan/trunk/bcel/src/main/java/org/apache/commons/classscan/bcel/BcelClass.java?rev=1462680&r1=1462679&r2=1462680&view=diff
==============================================================================
--- commons/sandbox/classscan/trunk/bcel/src/main/java/org/apache/commons/classscan/bcel/BcelClass.java (original)
+++ commons/sandbox/classscan/trunk/bcel/src/main/java/org/apache/commons/classscan/bcel/BcelClass.java Sat Mar 30 00:25:47 2013
@@ -68,10 +68,10 @@ public class BcelClass implements SpiMet
// set result to true to prevent re-resolution of classes involved in cyclic graphs
resolutionResult = Boolean.TRUE;
resolutionResult= Boolean.valueOf(resolveParent(classLoader)
- && resolveInterfaces(classLoader)
- && annotations.resolve(classLoader)
- && methods.resolve(classLoader)
- && fields.resolve(classLoader));
+ & resolveInterfaces(classLoader)
+ & annotations.resolve(classLoader)
+ & methods.resolve(classLoader)
+ & fields.resolve(classLoader));
}
return resolutionResult;
}
@@ -88,7 +88,7 @@ public class BcelClass implements SpiMet
logger.info("Cannot find parent "+parentName+" for class "+canonicalName);
success= false;
}
- parentName = null;
+ parentName = null;
}
return success;
}
@@ -167,12 +167,12 @@ public class BcelClass implements SpiMet
if (methods.length == 0) {
return NameSet.emptyNameSet();
}
-
+
SpiMetaMethod[] metaMethods = new SpiMetaMethod[methods.length];
for(int i = 0; i<methods.length; ++i) {
metaMethods[i]= new BcelMethod(methods[i]);
}
-
+
return new NameSet<SpiMetaMethod>(metaMethods);
}
@@ -186,12 +186,12 @@ public class BcelClass implements SpiMet
if (fields.length == 0) {
return NameSet.emptyNameSet();
}
-
+
SpiMetaField[] metaFields = new SpiMetaField[fields.length];
for(int i = 0; i<fields.length; ++i) {
metaFields[i]= new BcelField(fields[i]);
}
-
+
return new ResolveSet<SpiMetaField>(metaFields);
}