Update of /cvsroot/freenet/freenet/src/freenet/client
In directory sc8-pr-cvs1:/tmp/cvs-serv25874/src/freenet/client
Modified Files:
FreenetURI.java
Log Message:
6181:
*
* Keep 1 connection open at least for messages, not 2, and fix race conditions in
OpenConnectionManager. Should (i.e. might) fix recent behaviour of opening many
unnecessary connections to nodes.
* Fix NullPointerException in FreenetURI.
* Don't call transferSucceeded for transferring inserts. Reasons outlined in comments.
Just terminateRouting.
* Logging improvements.
Index: FreenetURI.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FreenetURI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FreenetURI.java 22 Nov 2002 01:27:41 -0000 1.2
+++ FreenetURI.java 8 Sep 2003 19:59:41 -0000 1.3
@@ -228,14 +228,18 @@
if (metaStr == null)
return setMetaString(strs);
else {
- newMetaStr = new String[metaStr.length + strs.length];
- System.arraycopy(metaStr, 0, newMetaStr, 0, metaStr.length);
+ // metaStr could be null... couldn't it? I don't really know this file..
+ // - amphibian
+ int curLen = (metaStr == null) ? 0 : metaStr.length;
+ newMetaStr = new String[curLen + strs.length];
+ if(metaStr != null)
+ System.arraycopy(metaStr, 0, newMetaStr, 0, metaStr.length);
System.arraycopy(strs, 0, newMetaStr, metaStr.length,
strs.length);
return setMetaString(strs);
}
}
-
+
/**
* Returns a copy of this URI with a new Document name set.
*/
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
