351592

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index 42daa4ca67a0745ea9a8914da53b192bf591a521..c28d7108197695c63602f22159449aa69a1e4a87 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -2462,7 +2462,7 @@ public class BcelShadow extends Shadow {
 
                ret.append(Utility.createInvoke(fact, callbackMethod));
                ret.append(Utility.createConversion(fact, callbackMethod.getReturnType(),
-                               BcelWorld.makeBcelType(munger.getSignature().getReturnType())));
+                               BcelWorld.makeBcelType(munger.getSignature().getReturnType()), world.isInJava5Mode()));
                return ret;
        }
 
@@ -2632,7 +2632,7 @@ public class BcelShadow extends Shadow {
                        ret.append(Utility.createConversion(fact, callbackMethod.getReturnType(), Type.OBJECT));
                }
                ret.append(Utility.createConversion(fact, callbackMethod.getReturnType(),
-                               BcelWorld.makeBcelType(munger.getSignature().getReturnType())));
+                               BcelWorld.makeBcelType(munger.getSignature().getReturnType()), world.isInJava5Mode()));
 
                return ret;