[freenet-cvs] r26612 - trunk/freenet/src/freenet/node

[j16sdiz]

Author: j16sdiz
Date: 2009-04-07 15:53:46 +0000 (Tue, 07 Apr 2009)
New Revision: 26612

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Move StringBuild.toString() out of synchronized{}

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2009-04-07 15:53:25 UTC 
(rev 26611)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2009-04-07 15:53:46 UTC 
(rev 26612)
@@ -1121,7 +1121,7 @@
                shouldWritePeers = true;
        }
        
-       protected StringBuilder getDarknetPeersString() {
+       protected String getDarknetPeersString() {
                StringBuilder sb = new StringBuilder();
                PeerNode[] peers;
                synchronized(this) {
@@ -1132,10 +1132,10 @@
                                sb.append(pn.exportDiskFieldSet());
                }
                
-               return sb;
+               return sb.toString();
        }
        
-       protected StringBuilder getOpennetPeersString() {
+       protected String getOpennetPeersString() {
                StringBuilder sb = new StringBuilder();
                PeerNode[] peers;
                synchronized(this) {
@@ -1146,23 +1146,23 @@
                                sb.append(pn.exportDiskFieldSet());
                }
                
-               return sb;
+               return sb.toString();
        }
        
-       protected StringBuilder getOldOpennetPeersString(OpennetManager om) {
+       protected String getOldOpennetPeersString(OpennetManager om) {
                StringBuilder sb = new StringBuilder();
                for(PeerNode pn : om.getOldPeers()) {
                        if(pn instanceof OpennetPeerNode)
                                sb.append(pn.exportDiskFieldSet());
                }
                
-               return sb;
+               return sb.toString();
        }
 
        private void writePeersInner() {
-               StringBuilder darknet = null;
-               StringBuilder opennet = null;
-               StringBuilder oldOpennetPeers = null;
+               String darknet = null;
+               String opennet = null;
+               String oldOpennetPeers = null;
                String oldOpennetPeersFilename = null;
                
                synchronized(writePeersSync) {
@@ -1191,7 +1191,7 @@
        /**
         * Write the peers file to disk
         */
-       private void writePeersInner(String filename, StringBuilder sb) {
+       private void writePeersInner(String filename, String sb) {
                synchronized(writePeerFileSync) {
                        FileOutputStream fos = null;
                        String f = filename + ".bak";
@@ -1210,7 +1210,7 @@
                                throw new Error("Impossible: JVM doesn't 
support UTF-8: " + e2, e2);
                        }
                        try {
-                               w.write(sb.toString());
+                               w.write(sb);
                                w.flush();
                                w.close();
                                w = null;

_______________________________________________
cvs mailing list
cvs@freenetproject.org
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs