293620: c4

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java
index 526fc4c92aa010c6a64e86234ad1e1fefa59a6f8..3a84535d7f71878f735e2bc0f602e447351b549a 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java
@@ -133,6 +133,10 @@ public class NamePattern extends PatternNode {
        }
 
        public boolean matches(String other) {
+               if (starCount == 1 && pattern.length == 1) {
+                       // optimize for wildcard
+                       return true;
+               }
                return matches(other.toCharArray());
        }
 

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
index 52ed63a0fc87e84f47fa49d6751bdc5144db5be1..974991bc48a4930a414d6f87e4fdaebadde89631 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
@@ -116,9 +116,12 @@ public class ThisOrTargetPointcut extends NameBindingPointcut {
                        return FuzzyBoolean.NO;
                }
                UnresolvedType typeToMatch = isThis ? shadow.getThisType() : shadow.getTargetType();
-               // if (typeToMatch == ResolvedType.MISSING) return FuzzyBoolean.NO;
-
-               return typePattern.matches(typeToMatch.resolve(shadow.getIWorld()), TypePattern.DYNAMIC);// AVPT was DYNAMIC
+               // optimization for case of this(Object) or target(Object)
+               // works for an ExactTypePattern (and we know there are no annotations to match here of course)
+               if (typePattern.getExactType().equals(ResolvedType.OBJECT)) {
+                       return FuzzyBoolean.YES;
+               }
+               return typePattern.matches(typeToMatch.resolve(shadow.getIWorld()), TypePattern.DYNAMIC);
        }
 
        @Override