Update of /cvsroot/freenet/freenet/src/freenet/node/ds
In directory sc8-pr-cvs1:/tmp/cvs-serv25857/src/freenet/node/ds
Modified Files:
Tag: stable
FSDataStoreElement.java KeyCollisionException.java
KeyInputStream.java
Added Files:
Tag: stable
StoreIOException.java
Log Message:
5029: Merge from unstable after months of work. MASSIVE changes.
Highlights:
* Next Generation Routing, massive related changes
* Major changes to handling of messages and connections (PeerHandler and related
changes)
* Even more non-blocking I/O
* Documentation improvements
* Lots of new diagnostics and config options
* Lots of bug fixes and performance tweaking
* Probably lots of new bugs too!
--- NEW FILE: StoreIOException.java ---
package freenet.node.ds;
import java.io.IOException;
public class StoreIOException extends IOException {
public StoreIOException(IOException e) {
initCause(e);
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(getClass().getName());
if(getCause() != null) {
sb.append(": "+getCause().toString());
}
return new String(sb);
}
}
Index: FSDataStoreElement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/FSDataStoreElement.java,v
retrieving revision 1.26.2.4.2.5
retrieving revision 1.26.2.4.2.6
diff -u -w -r1.26.2.4.2.5 -r1.26.2.4.2.6
--- FSDataStoreElement.java 5 Aug 2003 19:41:28 -0000 1.26.2.4.2.5
+++ FSDataStoreElement.java 28 Oct 2003 20:20:38 -0000 1.26.2.4.2.6
@@ -302,6 +302,10 @@
return length;
}
+ public final long realLength() {
+ return buffer.realLength();
+ }
+
public final Storables getStorables() {
return storables;
}
Index: KeyCollisionException.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/KeyCollisionException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- KeyCollisionException.java 13 Jan 2002 05:24:43 -0000 1.1.1.1
+++ KeyCollisionException.java 28 Oct 2003 20:20:38 -0000 1.1.1.1.6.1
@@ -2,4 +2,8 @@
import java.io.IOException;
-public class KeyCollisionException extends IOException {}
+public class KeyCollisionException extends StoreIOException {
+ public KeyCollisionException() {
+ super(null);
+ }
+}
Index: KeyInputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/KeyInputStream.java,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -w -r1.4 -r1.4.6.1
--- KeyInputStream.java 14 Jul 2002 16:07:01 -0000 1.4
+++ KeyInputStream.java 28 Oct 2003 20:20:38 -0000 1.4.6.1
@@ -10,6 +10,8 @@
public abstract class KeyInputStream extends InputStream {
public abstract long length();
+
+ public abstract long realLength();
public abstract Storables getStorables();
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
