diff options
| author | aclement <aclement> | 2010-08-10 15:11:54 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2010-08-10 15:11:54 +0000 |
| commit | 85fd25dc91475e6b9926b5c740f73b994eb84a49 (patch) | |
| tree | bf443cb668ea0a77c8399a067668ca3e701e6cdf /loadtime/src | |
| parent | 19a0acd18c64bcbdb64deceb1daf5387abb983e8 (diff) | |
| download | aspectj-85fd25dc91475e6b9926b5c740f73b994eb84a49.tar.gz aspectj-85fd25dc91475e6b9926b5c740f73b994eb84a49.zip | |
321641: test and fix: exclusion for double dollared names (eg. cglib)
Diffstat (limited to 'loadtime/src')
| -rw-r--r-- | loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java index 134de582f..b3a5f05be 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java @@ -33,10 +33,10 @@ import org.aspectj.bridge.AbortException; import org.aspectj.bridge.Constants; import org.aspectj.util.LangUtil; import org.aspectj.weaver.Lint; +import org.aspectj.weaver.Lint.Kind; import org.aspectj.weaver.ResolvedType; import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.World; -import org.aspectj.weaver.Lint.Kind; import org.aspectj.weaver.bcel.BcelWeakClassLoaderReference; import org.aspectj.weaver.bcel.BcelWeaver; import org.aspectj.weaver.bcel.BcelWorld; @@ -731,7 +731,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { } // still try to avoid ResolvedType if we have simple patterns - String fastClassName = className.replace('/', '.').replace('$', '.'); + String fastClassName = className.replace('/', '.'); for (String excludeStartsWithString : excludeStartsWith) { if (fastClassName.startsWith(excludeStartsWithString)) { return false; @@ -747,6 +747,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { } } } + fastClassName = fastClassName.replace('$', '.'); if (!excludeEndsWith.isEmpty()) { for (String lastPiece : excludeEndsWith) { |