Fix and testcase for Bugzilla Bug 49657

	  	Weaver results in rt error if affected base class not exposed

8 files changed, 58 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/base.jar b/org.aspectj.ajdt.core/testdata/partialHierarchy/base.jar
new file mode 100644
index 000000000..59bb33304
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/base.jar
diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/build.cmd b/org.aspectj.ajdt.core/testdata/partialHierarchy/build.cmd
new file mode 100644
index 000000000..74788b061
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/build.cmd
@@ -0,0 +1,8 @@
+call ajc -outjar fullBase.jar sample\Base.java sample\Derived.java sample\Iface.java

+jar xf fullBase.jar

+jar cf base.jar sample\Derived.class sample\Iface.class

+set XCLASSPATH=%CLASSPATH%

+set CLASSPATH=fullBase.jar;%CLASSPATH%

+call ajc -injars base.jar -outjar woven.jar sample\Trace.aj

+java -classpath woven.jar;%CLASSPATH%  sample.Derived

+set CLASSPATH=%XCLASSPATH%

diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/fullBase.jar b/org.aspectj.ajdt.core/testdata/partialHierarchy/fullBase.jar
new file mode 100644
index 000000000..6231415bb
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/fullBase.jar
diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Base.java b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Base.java
new file mode 100644
index 000000000..f126f668a
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Base.java
@@ -0,0 +1,9 @@
+package sample;
+
+public abstract class Base implements Iface {
+    int x;
+    Base() {
+	x=1;
+    }
+    abstract void foo();
+}
diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Derived.java b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Derived.java
new file mode 100644
index 000000000..cc79957a4
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Derived.java
@@ -0,0 +1,15 @@
+package sample;
+
+public class Derived extends Base {
+    int y;
+    public Derived() {
+	super();
+	y = 2;
+    }
+
+    public void foo() {}
+
+    public static void main(String args[]) {
+	new Derived();
+    }
+}
diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Iface.java b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Iface.java
new file mode 100644
index 000000000..a295b5f6b
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Iface.java
@@ -0,0 +1,4 @@
+package sample;
+
+public interface Iface {
+}
diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Trace.aj b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Trace.aj
new file mode 100644
index 000000000..a55778256
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/sample/Trace.aj
@@ -0,0 +1,22 @@
+package sample;

+

+import java.util.logging.Logger;

+

+public aspect Trace {

+    public interface Traced {}

+    declare parents: (sample.* && !Trace) extends Traced;

+

+//    private Logger Traced.logger;

+    before(Traced current) : 

+	execution(Traced+.new(..)) && !execution(Traced.new()) && this(current) {

+	current.getLogger().severe("entering ctor for "+thisJoinPoint);

+    }

+

+    public Logger Traced.getLogger() {

+ //       if (logger == null) {

+//	    logger = Logger.getLogger(getClass().toString());

+ //       }

+//	return logger;

+return null;

+    }

+}

diff --git a/org.aspectj.ajdt.core/testdata/partialHierarchy/woven.jar b/org.aspectj.ajdt.core/testdata/partialHierarchy/woven.jar
new file mode 100644
index 000000000..035e2b2c6
--- /dev/null
+++ b/org.aspectj.ajdt.core/testdata/partialHierarchy/woven.jar