test and fix for 145963: faulting in aspects coming in as binary inputs

2 files changed, 5 insertions, 3 deletions

diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 42c60a203..8224c6d9f 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
@@ -272,8 +272,8 @@ public class AspectJElementHierarchy implements IHierarchy {
 			lastSlash = sourceFilePath.lastIndexOf('/');
 		}
 		String fileName = sourceFilePath.substring(lastSlash+1);
-		IProgramElement fileNode = new ProgramElement(fileName, IProgramElement.Kind.FILE_JAVA, null);
-		fileNode.setSourceLocation(new SourceLocation(new File(sourceFilePath), 1, 1));
+		IProgramElement fileNode = new ProgramElement(fileName, IProgramElement.Kind.FILE_JAVA, new SourceLocation(new File(sourceFilePath), 1, 1),0,null,null);
+		//fileNode.setSourceLocation();
 		fileNode.addChild(NO_STRUCTURE);
 		return fileNode;
 	}
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index acddddfb2..af5a16960 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -162,8 +162,10 @@ public class ProgramElement implements IProgramElement {
 		return sourceLocation;
 	}
 
+	// not really sure why we have this setter ... how can we be in the situation where we didn't
+	// know the location when we built the node but we learned it later on?
 	public void setSourceLocation(ISourceLocation sourceLocation) {
-		//this.sourceLocation = sourceLocation;
+//		this.sourceLocation = sourceLocation;
 	}
 
 	public IMessage getMessage() {