From: aclement <aclement>
Date: Mon, 3 Oct 2005 14:09:09 +0000 (+0000)
Subject: pr83717: Dont expect to find source locations for type mungers if processing code... 
X-Git-Tag: preDefaultReweavable~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f27f533d1a9fe18634aeed8e49269c80f9ba2f00;p=aspectj.git

pr83717: Dont expect to find source locations for type mungers if processing code built with 1.2.1 or earlier.
---

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 {