Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv347/src/freenet/transport
Modified Files:
AbstractSelectorLoop.java ReadSelectorLoop.java
Log Message:
Bugfix to SendData wrt padding. Fix NPE in ASL. Logging. Indenting.
Index: AbstractSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/AbstractSelectorLoop.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -w -r1.79 -r1.80
--- AbstractSelectorLoop.java 14 Oct 2003 22:54:38 -0000 1.79
+++ AbstractSelectorLoop.java 14 Oct 2003 23:59:01 -0000 1.80
@@ -313,6 +313,7 @@
Iterator i = sel.keys().iterator();
while(i.hasNext()) {
SelectionKey curKey = (SelectionKey)i.next();
+ if(curKey == null) continue;
if
(curKey.attachment().equals(current.attachment)){
curKey.cancel();
break;
Index: ReadSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/ReadSelectorLoop.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -w -r1.55 -r1.56
--- ReadSelectorLoop.java 14 Oct 2003 22:54:40 -0000 1.55
+++ ReadSelectorLoop.java 14 Oct 2003 23:59:01 -0000 1.56
@@ -191,8 +191,9 @@
public final void scheduleMaintenance(SocketChannel cb,
NIOReader attachment) {
if(logDebug)
- Core.logger.log(this, "Scheduling maintenance on "+cb,
- new Exception("debug"),
Logger.DEBUG);
+ Core.logger.log(this, "Scheduling maintenance on "+cb+
+ ":"+attachment, new
Exception("debug"),
+ Logger.DEBUG);
synchronized (maintenanceQueue) {
maintenanceQueue.addLast(new MaintenancePair(attachment, cb));
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
