pr83717: Dont expect to find source locations for type mungers if processing code...

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index e602170c48a4d4933aca1cf7582e7a0860650b4c..8b0de53a4d1b0b35f8089345bb2e2138d5aa1a83 100644 (file)
--- 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 {