diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-04-01 08:10:34 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-04-01 08:10:34 -0700 |
| commit | f1f350f2bbc39241e67d5e350017f93d50468c6c (patch) | |
| tree | 2ed63b4daea67cab9c8cab7c624d3704f023e2ca /weaver | |
| parent | bbc514a031fe0f9814b29d0199b5caef72e7cab0 (diff) | |
| download | aspectj-f1f350f2bbc39241e67d5e350017f93d50468c6c.tar.gz aspectj-f1f350f2bbc39241e67d5e350017f93d50468c6c.zip | |
ASM 5.0.1 plus polish/formatting
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/.classpath | 2 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/weaver/.classpath b/weaver/.classpath index 31c1c7af2..179779f13 100644 --- a/weaver/.classpath +++ b/weaver/.classpath @@ -13,6 +13,6 @@ <classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/> - <classpathentry kind="lib" path="/lib/asm/asm-5.0_ALPHA.renamed.jar"/> + <classpathentry kind="lib" path="/lib/asm/asm-5.0.1.renamed.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java index 5481e605e..815becde0 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java @@ -162,8 +162,7 @@ public class BcelWeaver { String fixedName = aspectName; int hasDot = fixedName.lastIndexOf('.'); while (hasDot > 0) { - // System.out.println("BcelWeaver.addLibraryAspect " + - // fixedName); + // System.out.println("BcelWeaver.addLibraryAspect " + fixedName); char[] fixedNameChars = fixedName.toCharArray(); fixedNameChars[hasDot] = '$'; fixedName = new String(fixedNameChars); @@ -179,7 +178,6 @@ public class BcelWeaver { // System.out.println("type: " + type + " for " + aspectName); if (type.isAspect()) { - // Bug 119657 ensure we use the unwoven aspect WeaverStateInfo wsi = type.getWeaverState(); if (wsi != null && wsi.isReweavable()) { |