[freenet-cvs] r19458 - trunk/freenet/src/freenet/client

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-04-20 13:14:44 +0000 (Sun, 20 Apr 2008)
New Revision: 19458

Modified:
   trunk/freenet/src/freenet/client/ClientMetadata.java
   trunk/freenet/src/freenet/client/Metadata.java
Log:
intern() common strings


Modified: trunk/freenet/src/freenet/client/ClientMetadata.java
===================================================================
--- trunk/freenet/src/freenet/client/ClientMetadata.java        2008-04-20 
07:41:26 UTC (rev 19457)
+++ trunk/freenet/src/freenet/client/ClientMetadata.java        2008-04-20 
13:14:44 UTC (rev 19458)
@@ -12,7 +12,7 @@
        private String mimeType;

        public ClientMetadata(String mime) {
-               mimeType = mime;
+               mimeType = mime.intern();
        }

        /** Create an empty ClientMetadata instance */

Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java      2008-04-20 07:41:26 UTC 
(rev 19457)
+++ trunk/freenet/src/freenet/client/Metadata.java      2008-04-20 13:14:44 UTC 
(rev 19458)
@@ -323,7 +323,7 @@
                                short nameLength = dis.readShort();
                                byte[] buf = new byte[nameLength];
                                dis.readFully(buf);
-                               String name = new String(buf, "UTF-8");
+                               String name = new String(buf, "UTF-8").intern();
                                if(logMINOR) Logger.minor(this, "Entry "+i+" 
name "+name);
                                short len = dis.readShort();
                                if(len < 0)
@@ -376,7 +376,7 @@
                manifestEntries = new HashMap();
                int count = 0;
                for(Iterator i = dir.keySet().iterator();i.hasNext();) {
-                       String key = (String) i.next();
+                       String key = ((String) i.next()).intern();
                        count++;
                        Object o = dir.get(key);
                        Metadata target;
@@ -426,7 +426,7 @@
                manifestEntries = new HashMap();
                int count = 0;
                for(Iterator i = dir.keySet().iterator();i.hasNext();) {
-                       String key = (String) i.next();
+                       String key = ((String) i.next()).intern();
                        if(key.indexOf('/') != -1)
                                throw new IllegalArgumentException("Slashes in 
simple redirect manifest filenames! (slashes denote sub-manifests): "+key);
                        count++;
@@ -460,7 +460,7 @@
                manifestEntries = new HashMap();
                int count = 0;
                for(Iterator i = dir.keySet().iterator();i.hasNext();) {
-                       String key = (String) i.next();
+                       String key = ((String) i.next()).intern();
                        count++;
                        Object o = dir.get(key);
                        Metadata target;