fixes for 120363 : from matthew (include/exclude problems for LTW)

1 files changed, 13 insertions, 8 deletions

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index f2c628a35..35a568858 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -465,16 +465,21 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
                 return false;
             }
         }
-        boolean fastAccept = false;//defaults to false if no fast include
-        for (int i = 0; i < m_includeStartsWith.size(); i++) {
-            fastAccept = fastClassName.startsWith((String)m_includeStartsWith.get(i));
-            if (fastAccept) {
-                break;
+        
+        /* 
+         * Bug 120363
+         * If we have an exclude pattern that cannot be matched using "starts with"
+         * then we cannot fast accept
+         */ 
+        if (m_excludeTypePattern.isEmpty()) {
+            boolean fastAccept = false;//defaults to false if no fast include
+            for (int i = 0; i < m_includeStartsWith.size(); i++) {
+                fastAccept = fastClassName.startsWith((String)m_includeStartsWith.get(i));
+                if (fastAccept) {
+                    break;
+                }
             }
         }
-        if (fastAccept) {
-            return true;
-        }
 
         // needs further analysis
         // TODO AV - needs refactoring