Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv5461/src/freenet
Modified Files:
OpenConnectionManager.java Version.java
Log Message:
Fix an NPE in the Peer html stuff
Ensure that ResponseTimeEstimators always have a recent, not positive this fix is
right, so toad, please read it and check me.
Bump version so we have a consistent build number before and after these bugs
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -w -r1.153 -r1.154
--- OpenConnectionManager.java 30 Oct 2003 03:27:33 -0000 1.153
+++ OpenConnectionManager.java 30 Oct 2003 04:29:37 -0000 1.154
@@ -22,6 +22,7 @@
import freenet.node.NodeReference;
import freenet.node.rt.NGRoutingTable;
import freenet.node.rt.RoutingTable;
+import freenet.node.rt.NodeEstimator;
import freenet.node.rt.TimeEstimator;
import freenet.session.Link;
import freenet.session.LinkManager;
@@ -2090,7 +2091,12 @@
colors.put("tTransferRate", new
Color(255,255,0));
colors.put("pDNF", new Color(0,255,0));
colors.put("tDNF", new Color(0,0,255));
-
ngrt.getEstimator(i).getHTMLReportingTool().drapGraphOnImage(false,bmp,colors);
+ NodeEstimator est = ngrt.getEstimator(i);
+ if(est == null){
+ resp.sendError(404, "Invalid graph '"+graph+"' specified");
+ return true;
+ }
+ est.getHTMLReportingTool().drapGraphOnImage(false,bmp,colors);
}else{
TimeEstimator e =ngrt.getEstimator(i, graph);
if(e == null) {
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -w -r1.483 -r1.484
--- Version.java 30 Oct 2003 02:39:38 -0000 1.483
+++ Version.java 30 Oct 2003 04:29:37 -0000 1.484
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.47";
/** The build number of the current revision */
- public static final int buildNumber = 6287;
+ public static final int buildNumber = 6288;
public static final int ignoreBuildsAfter = 6500;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
