better if no aliases consistently means null rather null before serialization and...

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index f3d3c428a647edcfc9e539052ea09e18f49d0ee7..169c6e3f77c72aa696b8972244c4f1dec1e76e8a 100644 (file)
--- 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;
        }