better if no aliases consistently means null rather null before serialization and an empty arraylist after deserialization

1 files changed, 6 insertions, 4 deletions

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index f3d3c428a..169c6e3f7 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
@@ -316,11 +316,13 @@ public abstract class ResolvedTypeMunger {
 	protected static List readInTypeAliases(VersionedDataInputStream s) throws IOException {
 		if (s.getMajorVersion()>=AjAttribute.WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ150) {
 			int count = s.readInt();
-			List aliases = new ArrayList();
-			for (int i=0;i<count;i++) {
-				aliases.add(s.readUTF());
+			if (count!=0) {
+				List aliases = new ArrayList();
+				for (int i=0;i<count;i++) {
+					aliases.add(s.readUTF());
+				}
+				return aliases;
 			}
-			return aliases;
 		}
 		return null;
 	}