aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2005-10-03 14:09:09 +0000
committeraclement <aclement>2005-10-03 14:09:09 +0000
commitf27f533d1a9fe18634aeed8e49269c80f9ba2f00 (patch)
tree1774a3ac0fa366f74d51802c6f63e03954737ba9
parente21bf1e36e46dae8c49d9d83bf810747ff56f0a9 (diff)
downloadaspectj-f27f533d1a9fe18634aeed8e49269c80f9ba2f00.tar.gz
aspectj-f27f533d1a9fe18634aeed8e49269c80f9ba2f00.zip
pr83717: Dont expect to find source locations for type mungers if processing code built with 1.2.1 or earlier.
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index e602170c4..8b0de53a4 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
@@ -162,8 +162,10 @@ public abstract class ResolvedTypeMunger {
}
- protected static ISourceLocation readSourceLocation(DataInputStream s) throws IOException {
+ protected static ISourceLocation readSourceLocation(VersionedDataInputStream s) throws IOException {
if (!persistSourceLocation) return null;
+ // Location persistence for type mungers was added after 1.2.1 was shipped...
+ if (s.getMajorVersion()<AjAttribute.WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ150) return null;
SourceLocation ret = null;
ObjectInputStream ois = null;
try {