diff options
| author | Andy Clement <aclement@pivotal.io> | 2016-02-11 13:59:51 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2016-02-11 13:59:51 -0800 |
| commit | a17b28a1a9a0756cfc2181bf2b095650e186425a (patch) | |
| tree | 5972c7d51d269d2362c11bec63370235ed6c17e9 /weaver5 | |
| parent | b54540d9a4843a46d6c2a25f6d2e7470648ef7c7 (diff) | |
| download | aspectj-a17b28a1a9a0756cfc2181bf2b095650e186425a.tar.gz aspectj-a17b28a1a9a0756cfc2181bf2b095650e186425a.zip | |
Fix 487694: Race condition in annotation unpacking can surface through Spring AOP
Diffstat (limited to 'weaver5')
| -rw-r--r-- | weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java index c19f38e46..a978d9605 100644 --- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java +++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java @@ -254,7 +254,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder { org.aspectj.apache.bcel.classfile.annotation.AnnotationGen[] anns = jc.getAnnotations(); bcelRepository.clear(); if (anns == null) - return new ResolvedType[0]; + return ResolvedType.NONE; ResolvedType[] ret = new ResolvedType[anns.length]; for (int i = 0; i < ret.length; i++) { ret[i] = inWorld.resolve(UnresolvedType.forSignature(anns[i].getTypeSignature())); |