Fix and tests for PR94167: NPE in reflection API. Fix submitted by Ron Bodkin.

2 files changed, 2 insertions, 2 deletions

diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
index e814a5add..6bf899a22 100644
--- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
@@ -62,7 +62,7 @@ class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature {
 	public Method getAdvice() {
 		if (adviceMethod == null) {
 			try {
-				adviceMethod = declaringType.getDeclaredMethod(getName(),getParameterTypes());
+				adviceMethod = getDeclaringType().getDeclaredMethod(getName(),getParameterTypes());
 			} catch (Exception ex) {
 				; // nothing we can do, caller will see null
 			}
diff --git a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
index 3331df08d..612d0ca0e 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
@@ -60,7 +60,7 @@ class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature {
 	public Method getMethod() {
 		if (method == null) {
 			try {
-				method = declaringType.getDeclaredMethod(getName(),getParameterTypes());
+				method = getDeclaringType().getDeclaredMethod(getName(),getParameterTypes());
 			} catch (NoSuchMethodException nsmEx) {
 				; // nothing we can do, user will see null return
 			}