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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-22 19:57:24 +0000 (Sat, 22 Jul 2006)
New Revision: 9718

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
again, we don't want an endless stream of synchronized(this) { do something } 
synchronized(this) { do something else } ... even if they're getters.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-07-22 19:53:57 UTC 
(rev 9717)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-07-22 19:57:24 UTC 
(rev 9718)
@@ -1723,7 +1723,7 @@
     /**
      * Export volatile data about the node as a SimpleFieldSet
      */
-    public SimpleFieldSet exportVolatileFieldSet() {
+    public synchronized SimpleFieldSet exportVolatileFieldSet() {
                SimpleFieldSet fs = new SimpleFieldSet(true);
                long now = System.currentTimeMillis();
                fs.put("averagePingTime", Double.toString(averagePingTime()));
@@ -1731,16 +1731,14 @@
                if(idle > (60 * 1000)) {  // 1 minute
                        fs.put("idle", Long.toString(idle));
                }
-               fs.put("lastRoutingBackoffReason", getLastBackoffReason());
+               fs.put("lastRoutingBackoffReason", lastRoutingBackoffReason);
                long tempPeerAddedTime = getPeerAddedTime();
                if(tempPeerAddedTime > 1) {
                        fs.put("peerAddedTime", 
Long.toString(tempPeerAddedTime));
                }
-               synchronized(this) {
-                       fs.put("routingBackoffPercent", 
Double.toString(backedOffPercent.currentValue() * 100));
-               }
-               fs.put("routingBackoff", 
Long.toString((Math.max(getRoutingBackedOffUntil() - now, 0))));
-               fs.put("routingBackoffLength", 
Integer.toString(getRoutingBackoffLength()));
+               fs.put("routingBackoffPercent", 
Double.toString(backedOffPercent.currentValue() * 100));
+               fs.put("routingBackoff", 
Long.toString((Math.max(routingBackedOffUntil - now, 0))));
+               fs.put("routingBackoffLength", 
Integer.toString(routingBackoffLength));
                fs.put("status", getPeerNodeStatusString());
                return fs;
        }