Author: dbrosius
Date: Sun Oct 18 02:00:16 2009
New Revision: 826340
URL: http://svn.apache.org/viewvc?rev=826340&view=rev
Log:
code assumes Utility.getAnnotationAttributes won't return null, but does.
convert it to just return an Attribute[0] instead of null
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=826340&r1=826339&r2=826340&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java Sun
Oct 18 02:00:16 2009
@@ -1356,7 +1356,7 @@
*/
public static Attribute[] getAnnotationAttributes(ConstantPoolGen cp,List
vec) {
- if (vec.isEmpty()) return null;
+ if (vec.isEmpty()) return new Attribute[0];
try {
int countVisible = 0;
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java?rev=826340&r1=826339&r2=826340&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java Sun
Oct 18 02:00:16 2009
@@ -227,11 +227,9 @@
private void addAnnotationsAsAttribute(ConstantPoolGen cp) {
Attribute[] attrs = Utility.getAnnotationAttributes(cp,annotation_vec);
- if (attrs!=null) {
- for (int i = 0; i < attrs.length; i++) {
- addAttribute(attrs[i]);
- }
- }
+ for (int i = 0; i < attrs.length; i++) {
+ addAttribute(attrs[i]);
+ }
}
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java?rev=826340&r1=826339&r2=826340&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java Sun
Oct 18 02:00:16 2009
@@ -634,11 +634,9 @@
public void addAnnotationsAsAttribute(ConstantPoolGen cp) {
Attribute[] attrs = Utility.getAnnotationAttributes(cp,annotation_vec);
- if (attrs!=null) {
- for (int i = 0; i < attrs.length; i++) {
- addAttribute(attrs[i]);
- }
- }
+ for (int i = 0; i < attrs.length; i++) {
+ addAttribute(attrs[i]);
+ }
}
public void addParameterAnnotationsAsAttribute(ConstantPoolGen cp) {
---------------------------------------------------------------------
To unsubscribe, e-mail: bcel-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: bcel-dev-h...@jakarta.apache.org
