source locations are always written out now.

3 files changed, 12 insertions, 8 deletions

diff --git a/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java b/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java
index 1d73aaf1f..6acd4b7e7 100644
--- a/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java
@@ -48,7 +48,7 @@ public class NewConstructorTypeMunger extends ResolvedTypeMunger {
 		syntheticConstructor.write(s);
 		explicitConstructor.write(s);
 		writeSuperMethodsCalled(s);
-		if (ResolvedTypeMunger.persistSourceLocation) writeSourceLocation(s);
+		writeSourceLocation(s);
 	}
 	
 	public static ResolvedTypeMunger readConstructor(VersionedDataInputStream s, ISourceContext context) throws IOException {
@@ -57,7 +57,7 @@ public class NewConstructorTypeMunger extends ResolvedTypeMunger {
 				ResolvedMemberImpl.readResolvedMember(s, context),
 				ResolvedMemberImpl.readResolvedMember(s, context),
 				readSuperMethodsCalled(s));
-		if (ResolvedTypeMunger.persistSourceLocation) munger.setSourceLocation(readSourceLocation(s));
+		munger.setSourceLocation(readSourceLocation(s));
 		return munger;
 	}
 
diff --git a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
index 3d8ba73e9..e7b2a3ca5 100644
--- a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
@@ -33,13 +33,13 @@ public class NewFieldTypeMunger extends ResolvedTypeMunger {
 		kind.write(s);
 		signature.write(s);
 		writeSuperMethodsCalled(s);
-		if (ResolvedTypeMunger.persistSourceLocation) writeSourceLocation(s);
+		writeSourceLocation(s);
 	}
 
 	public static ResolvedTypeMunger readField(VersionedDataInputStream s, ISourceContext context) throws IOException {
 		ResolvedTypeMunger munger = new NewFieldTypeMunger(
 			ResolvedMemberImpl.readResolvedMember(s, context),readSuperMethodsCalled(s));
-		if (ResolvedTypeMunger.persistSourceLocation) munger.setSourceLocation(readSourceLocation(s));
+		munger.setSourceLocation(readSourceLocation(s));
 		return munger;
 	}
 	
diff --git a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
index 98dd96be1..d7538763f 100644
--- a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
@@ -17,6 +17,8 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Set;
 
+import org.aspectj.bridge.ISourceLocation;
+
 public class NewMethodTypeMunger extends ResolvedTypeMunger {
 	public NewMethodTypeMunger(
 		ResolvedMember signature,
@@ -37,13 +39,15 @@ public class NewMethodTypeMunger extends ResolvedTypeMunger {
 		kind.write(s);
 		signature.write(s);
 		writeSuperMethodsCalled(s);
-		if (ResolvedTypeMunger.persistSourceLocation) writeSourceLocation(s);
+		writeSourceLocation(s);
 	}
 	
 	public static ResolvedTypeMunger readMethod(VersionedDataInputStream s, ISourceContext context) throws IOException {
-		ResolvedTypeMunger munger = new NewMethodTypeMunger(
-				ResolvedMemberImpl.readResolvedMember(s, context),readSuperMethodsCalled(s));
-		if (ResolvedTypeMunger.persistSourceLocation) munger.setSourceLocation(readSourceLocation(s));
+		ResolvedMemberImpl rmi = ResolvedMemberImpl.readResolvedMember(s, context);
+		Set superMethodsCalled = readSuperMethodsCalled(s);
+		ISourceLocation sLoc = readSourceLocation(s);
+		ResolvedTypeMunger munger = new NewMethodTypeMunger(rmi,superMethodsCalled);
+		if (sLoc!=null) munger.setSourceLocation(sLoc);
 		return munger;
 	}