From: aclement <aclement>
Date: Thu, 7 Feb 2008 17:00:25 +0000 (+0000)
Subject: 218167: test and fix: compiler crash on multiple dec @fields
X-Git-Tag: V1_6_0M2~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db0e7de7899794db02664dbd71ccafdb2dc89496;p=aspectj.git

218167: test and fix: compiler crash on multiple dec @fields
---

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 1acf634fb..a486c5a72 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -1065,7 +1065,7 @@ class BcelClassWeaver implements IClassWeaver {
 		    while (!worthRetrying.isEmpty() && modificationOccured) {
 				modificationOccured = false;
                 List forRemoval = new ArrayList();
-                for (Iterator iter2 = worthRetrying.iterator(); iter.hasNext();) {
+                for (Iterator iter2 = worthRetrying.iterator(); iter2.hasNext();) {
 				  DeclareAnnotation decaMC = (DeclareAnnotation) iter2.next();
 				  if (decaMC.matches(unMangledInterMethod,world)) {
 					LazyMethodGen annotationHolder = locateAnnotationHolderForFieldMunger(clazz,methodctorMunger);
@@ -1311,7 +1311,7 @@ class BcelClassWeaver implements IClassWeaver {
 					  reportedProblems.add(uniqueID);
 					  reportedProblems.add(new Integer(itdfieldsig.hashCode()*deca.hashCode()));
 					  world.getLint().elementAlreadyAnnotated.signal(
-						new String[]{rm.toString(),deca.getAnnotationTypeX().toString()},
+						new String[]{itdfieldsig.toString(),deca.getAnnotationTypeX().toString()},
 						rm.getSourceLocation(),new ISourceLocation[]{deca.getSourceLocation()});
 				  }
 			  }