diff options
| -rw-r--r-- | lib/aspectj/lib/aspectjweaver.jar | bin | 2178828 -> 2179438 bytes | |||
| -rw-r--r-- | weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/aspectj/lib/aspectjweaver.jar b/lib/aspectj/lib/aspectjweaver.jar Binary files differindex 63d5843d7..2e29cf8b0 100644 --- a/lib/aspectj/lib/aspectjweaver.jar +++ b/lib/aspectj/lib/aspectjweaver.jar diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java index 0cf759e73..31102c96f 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java @@ -72,8 +72,7 @@ public class SimpleCache { byte[] res = get(classname, bytes); if (Arrays.equals(SAME_BYTES, res)) { - // TODO: Should we return null (means "not transformed") in this case? - return bytes; + return null; } else { if (res != null) { initializeClass(classname, res, loader, protectionDomain); @@ -97,7 +96,7 @@ public class SimpleCache { String key = generateKey(classname, origbytes); - if (Arrays.equals(origbytes, wovenbytes)) { + if (wovenbytes == null || Arrays.equals(origbytes, wovenbytes)) { cacheMap.put(key, SAME_BYTES); return; } |