diff options
| author | aclement <aclement> | 2011-02-02 00:40:05 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2011-02-02 00:40:05 +0000 |
| commit | a135fc78cdc2ae02688b285a4898ec4cd10bdf73 (patch) | |
| tree | 5564e7308457a781aa4bab9ddfdd7e4007984130 /org.aspectj.matcher | |
| parent | 50b404c520f5ffb80e6849aa3498733beb74ca36 (diff) | |
| download | aspectj-a135fc78cdc2ae02688b285a4898ec4cd10bdf73.tar.gz aspectj-a135fc78cdc2ae02688b285a4898ec4cd10bdf73.zip | |
335682
Diffstat (limited to 'org.aspectj.matcher')
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java | 8 | ||||
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java index a727825b0..781227141 100644 --- 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 62a643919..38b2081b0 100644 --- 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 |