335682

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
index a727825b0f0f48faf91fd103df5cbcd05df05aa4..7812271417027f38c2121bfec8b122071a2e3655 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
@@ -565,8 +565,8 @@ public abstract class AjAttribute {
                public static AdviceAttribute read(VersionedDataInputStream s, ISourceContext context) throws IOException {
                        AdviceKind kind = AdviceKind.read(s);
                        if (kind == AdviceKind.Around) {
-                               return new AdviceAttribute(kind, Pointcut.read(s, context), s.readByte(), s.readInt(), s.readInt(), context, s
-                                               .readBoolean(), ResolvedMemberImpl.readResolvedMemberArray(s, context), FileUtil.readBooleanArray(s),
+                               return new AdviceAttribute(kind, Pointcut.read(s, context), s.readByte(), s.readInt(), s.readInt(), context,
+                                               s.readBoolean(), ResolvedMemberImpl.readResolvedMemberArray(s, context), FileUtil.readBooleanArray(s),
                                                UnresolvedType.readArray(s));
                        } else {
                                return new AdviceAttribute(kind, Pointcut.read(s, context), s.readByte(), s.readInt(), s.readInt(), context);
@@ -731,8 +731,8 @@ public abstract class AjAttribute {
                }
 
                public static EffectiveSignatureAttribute read(VersionedDataInputStream s, ISourceContext context) throws IOException {
-                       return new EffectiveSignatureAttribute(ResolvedMemberImpl.readResolvedMember(s, context), Shadow.Kind.read(s), s
-                                       .readBoolean());
+                       ResolvedMember member = ResolvedMemberImpl.readResolvedMember(s, context);
+                       return new EffectiveSignatureAttribute(member, Shadow.Kind.read(s), s.readBoolean());
                }
 
                public ResolvedMember getEffectiveSignature() {

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java b/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java
index 62a643919bdf0298e7e95003c524fe28bdd67a7e..38b2081b0d6637c86ea4eff4fdaae5becd10979c 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java
@@ -80,4 +80,8 @@ public class VersionedDataInputStream extends DataInputStream {
        public UnresolvedType readSignatureAsUnresolvedType() throws IOException {
                return UnresolvedType.forSignature(readUtf8(readShort()));
        }
+
+       public String toString() {
+               return "VersionedDataInputStream: version=" + version + " constantPoolReader?" + (constantPoolReader != null);
+       }
 }
\ No newline at end of file