Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-10-24 18:24:16 +0000
committerJohn Arthorne2008-10-24 18:24:16 +0000
commit16595266007fefaa5a13191f0528af37238c45a4 (patch)
tree8db29e21b59ac4a1904625fbb27c9cae1abc82a1 /bundles/org.eclipse.equinox.p2.core
parent019cdf89dcef64be91eccbb415065d6603c5c3cc (diff)
downloadrt.equinox.p2-16595266007fefaa5a13191f0528af37238c45a4.tar.gz
rt.equinox.p2-16595266007fefaa5a13191f0528af37238c45a4.tar.xz
rt.equinox.p2-16595266007fefaa5a13191f0528af37238c45a4.zip
Bug 251623 Use singleton for zero-length arrays in InstallableUnit
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.core')
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java
index 21e2b36d2..168524c21 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java
@@ -47,7 +47,8 @@ public final class StringPool {
savings += 44 + 2 * string.length();
return (String) result;
}
- map.put(string, string);
+ //explicitly copy the string to trim excess baggage
+ map.put(string, new String(string));
return string;
}
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
index b39149e75..4c1c0555e 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
@@ -476,7 +476,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
}
protected void processCharacters(String data) {
- this.text = data;
+ this.text = canonicalize(data);
if (texts != null) {
texts.add(getText());
}

Back to the top