From 808bae83b3d5f37de4b39a2380db2782919a5f8a Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Thu, 10 Apr 2003 22:20:14 +0000
Subject: test and fix for Bugzilla Bug 36046    inter-type declaration bug
 with abstract classes

---
 weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java |  7 ++++++-
 weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java    |  2 +-
 weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java   | 10 +++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'weaver')

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 79eb5f29c..4cb41ad1c 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -220,7 +220,12 @@ class BcelClassWeaver implements IClassWeaver {
 
 	private boolean alreadyDefined(LazyClassGen clazz, LazyMethodGen mg) {
 		for (Iterator i = clazz.getMethodGens().iterator(); i.hasNext(); ) {
-			if (signaturesMatch(mg, (LazyMethodGen)i.next())) {
+			LazyMethodGen existing = (LazyMethodGen)i.next();
+			if (signaturesMatch(mg, existing)) {
+				if (!mg.isAbstract() && existing.isAbstract()) {
+					i.remove();
+					return false;
+				}
 				return true;
 			}
 		}
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
index 4c6308d01..39f3427e9 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
@@ -147,7 +147,7 @@ public final class LazyClassGen {
     }
 
     public List getMethodGens() {
-        return Collections.unmodifiableList(methodGens);
+        return methodGens; //???Collections.unmodifiableList(methodGens);
 
     }
 
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index 7703774f1..adf0c953a 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -594,9 +594,13 @@ public final class LazyMethodGen {
         return prevLine;
     }
 
-    public boolean isStatic() {
-        return Modifier.isStatic(getAccessFlags());
-    }
+	public boolean isStatic() {
+		return Modifier.isStatic(getAccessFlags());
+	}
+    
+	public boolean isAbstract() {
+		return Modifier.isAbstract(getAccessFlags());
+	}
     
     public void addExceptionHandler(
             InstructionHandle start,
-- 
cgit v1.2.3