Bit of shuffling to keep the build machine happy. Basically the PointcutExpressionTest is now in *two* places. Its in weaver and when run it will not use a 1.5 delegate, and its in weaver5 where it *will* use a 1.5 delegate. I changed the logic in the ReflectionDelegateFactory to allow for being unable to find the 1.5 delegate class, although this should only arise on the build machine or running weaver tests standalone.

1 files changed, 3 insertions, 3 deletions

diff --git a/weaver/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java b/weaver/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
index 33d467415..52eefe0b6 100644
--- a/weaver/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
+++ b/weaver/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
@@ -38,10 +38,10 @@ public class ReflectionBasedReferenceTypeDelegateFactory {
 		try {
 			Class c = Class.forName(forReferenceType.getName());
 			if (LangUtil.is15VMOrGreater()) {
-				return create15Delegate(forReferenceType,c,inWorld);
-			} else {
-				return new ReflectionBasedReferenceTypeDelegate(c,inWorld,forReferenceType);
+				ReflectionBasedReferenceTypeDelegate rbrtd = create15Delegate(forReferenceType,c,inWorld);
+				if (rbrtd!=null) return rbrtd; // can be null if we didn't find the class the delegate logic loads
 			}
+			return new ReflectionBasedReferenceTypeDelegate(c,inWorld,forReferenceType);
 		} catch (ClassNotFoundException cnfEx) {
 			return null;
 		}