fix for pr120693

2 files changed, 13 insertions, 6 deletions

diff --git a/weaver/src/org/aspectj/weaver/Lint.java b/weaver/src/org/aspectj/weaver/Lint.java
index 92dc373c5..ef025d693 100644
--- a/weaver/src/org/aspectj/weaver/Lint.java
+++ b/weaver/src/org/aspectj/weaver/Lint.java
@@ -198,12 +198,19 @@ public class Lint {
 	}
 	
 	// remove any suppression of lint warnings in place
-	public void clearSuppressions() {
+	public void clearAllSuppressions() {
 		for (Iterator iter = kinds.values().iterator(); iter.hasNext();) {
 			Kind k = (Kind) iter.next();
 			k.setSuppressed(false);
 		}		
 	}
+	
+	public void clearSuppressions(Collection lintKind) {
+		for (Iterator iter = lintKind.iterator(); iter.hasNext();) {
+			Kind k = (Kind) iter.next();
+			k.setSuppressed(false);
+		}
+	}
 
 	private IMessage.Kind getMessageKind(String v) {
 		if (v.equals("ignore")) return null;
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
index f18506e25..e6f0d88c8 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
@@ -82,7 +82,7 @@ public class BcelAdvice extends Advice {
 	public ShadowMunger concretize(ResolvedType fromType, World world, PerClause clause) {
 		suppressLintWarnings(world);
 		ShadowMunger ret = super.concretize(fromType, world, clause);
-		clearLintSuppressions(world);
+		clearLintSuppressions(world,this.suppressedLintKinds);
 		return ret;
 	}
 	
@@ -102,7 +102,7 @@ public class BcelAdvice extends Advice {
 	public boolean match(Shadow shadow, World world) {
 		suppressLintWarnings(world);
 		boolean ret = super.match(shadow, world);
-		clearLintSuppressions(world);
+		clearLintSuppressions(world,this.suppressedLintKinds);
 		return ret;
 	}
 	
@@ -130,7 +130,7 @@ public class BcelAdvice extends Advice {
     	World world = shadow.getIWorld();
     	suppressLintWarnings(world);
 		pointcutTest = getPointcut().findResidue(shadow, exposedState);
-		clearLintSuppressions(world);
+		clearLintSuppressions(world,this.suppressedLintKinds);
 		
 		// these initializations won't be performed by findResidue, but need to be
 		// so that the joinpoint is primed for weaving
@@ -629,7 +629,7 @@ public class BcelAdvice extends Advice {
     	inWorld.getLint().suppressKinds(suppressedLintKinds);
 	}
 	
-	protected void clearLintSuppressions(World inWorld) {
-		inWorld.getLint().clearSuppressions();
+	protected void clearLintSuppressions(World inWorld,Collection toClear) {
+		inWorld.getLint().clearSuppressions(toClear);
 	}
 }