diff options
| author | aclement <aclement> | 2010-08-03 21:36:17 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2010-08-03 21:36:17 +0000 |
| commit | 5f2e71caa9e55d921d64967628cf749429486c1e (patch) | |
| tree | 893f7512114a7c639d38538d289bf0d2131bfd58 /weaver/src | |
| parent | 5a5c2f6b1feaca1c01a4bbde4676d70876bcc0e7 (diff) | |
| download | aspectj-5f2e71caa9e55d921d64967628cf749429486c1e.tar.gz aspectj-5f2e71caa9e55d921d64967628cf749429486c1e.zip | |
278496: don't use hasAnnotations
Diffstat (limited to 'weaver/src')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelMethod.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java index fd2d6a465..2523c3695 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java @@ -31,8 +31,8 @@ import org.aspectj.apache.bcel.classfile.annotation.NameValuePair; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.SourceLocation; import org.aspectj.util.GenericSignature; -import org.aspectj.util.GenericSignatureParser; import org.aspectj.util.GenericSignature.TypeVariableSignature; +import org.aspectj.util.GenericSignatureParser; import org.aspectj.weaver.AjAttribute; import org.aspectj.weaver.AnnotationAJ; import org.aspectj.weaver.BCException; @@ -126,7 +126,8 @@ class BcelMethod extends ResolvedMemberImpl { int len = getArity(); if (varTable == null) { // do we have an annotation with the argNames value specified... - if (hasAnnotations()) { + AnnotationAJ[] annos = getAnnotations(); + if (annos != null && annos.length != 0) { AnnotationAJ[] axs = getAnnotations(); for (int i = 0; i < axs.length; i++) { AnnotationAJ annotationX = axs[i]; @@ -185,8 +186,8 @@ class BcelMethod extends ResolvedMemberImpl { resolvedDeclaringType.getSourceContext(), world, bcelObjectType.getWeaverVersionAttribute(), new BcelConstantPoolReader(method.getConstantPool())); processAttributes(world, as); - as = AtAjAttributes.readAj5MethodAttributes(method, this, resolvedDeclaringType, preResolvedPointcut, resolvedDeclaringType - .getSourceContext(), world.getMessageHandler()); + as = AtAjAttributes.readAj5MethodAttributes(method, this, resolvedDeclaringType, preResolvedPointcut, + resolvedDeclaringType.getSourceContext(), world.getMessageHandler()); processAttributes(world, as); } |