diff --git a/o.n.bootstrap/src/org/netbeans/ModuleData.java b/o.n.bootstrap/src/org/netbeans/ModuleData.java --- a/o.n.bootstrap/src/org/netbeans/ModuleData.java +++ b/o.n.bootstrap/src/org/netbeans/ModuleData.java @@ -128,9 +128,9 @@ specVers = null; } String iv = attr.getValue("OpenIDE-Module-Implementation-Version"); // NOI18N - implVersion = iv == null ? "" : iv; + implVersion = iv == null ? "" : iv.intern(); String bld = attr.getValue("OpenIDE-Module-Build-Version"); // NOI18N - buildVersion = bld == null ? implVersion : bld; + buildVersion = bld == null ? implVersion : bld.intern(); this.provides = computeProvides(forModule, attr, verifyCNBs, false); @@ -194,7 +194,7 @@ Dependency.create(Dependency.TYPE_MODULE, piece); } // OK, add it. - set.add(piece); + set.add(piece.intern()); } if (set.isEmpty()) { throw new IllegalArgumentException("Empty OpenIDE-Module-Friends: " + friends); // NOI18N @@ -251,8 +251,8 @@ this.codeNameRelease = dis.readInt(); this.coveredPackages = readStrings(dis, new HashSet(), true); this.dependencies = (Dependency[]) dis.readObject(); - this.implVersion = dis.readUTF(); - this.buildVersion = dis.readUTF(); + this.implVersion = dis.readUTF().intern(); + this.buildVersion = dis.readUTF().intern(); this.provides = readStrings(dis); this.friendNames = readStrings(dis, new HashSet(), false); this.specVers = new SpecificationVersion(dis.readUTF()); @@ -477,7 +477,7 @@ return null; } while (cnt-- > 0) { - set.add(dis.readUTF()); + set.add(dis.readUTF().intern()); } return set; }