Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv19937/src/freenet/transport
Modified Files:
AbstractSelectorLoop.java ReadSelectorLoop.java
Log Message:
stupid NPE fixes. Introduced in prev build. :(
Index: AbstractSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/AbstractSelectorLoop.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -w -r1.78 -r1.79
--- AbstractSelectorLoop.java 14 Oct 2003 19:41:38 -0000 1.78
+++ AbstractSelectorLoop.java 14 Oct 2003 22:54:38 -0000 1.79
@@ -303,8 +303,11 @@
synchronized(unregisterWaiters) {
while (unregisterWaiters.size() >0) {
ChannelAttachmentPair current =
(ChannelAttachmentPair)unregisterWaiters.removeFirst();
- if (current.channel!=null) //we have a channel
- current.channel.keyFor(sel).cancel();
+ if (current.channel!=null) {
+ //we have a channel
+ SelectionKey k = current.channel.keyFor(sel);
+ if(k != null) k.cancel();
+ }
// Not used by WSL, so we don't need to tell it
else if (current.attachment!=null) { //we have only the
attachment
Iterator i = sel.keys().iterator();
Index: ReadSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/ReadSelectorLoop.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -w -r1.54 -r1.55
--- ReadSelectorLoop.java 14 Oct 2003 22:43:47 -0000 1.54
+++ ReadSelectorLoop.java 14 Oct 2003 22:54:40 -0000 1.55
@@ -164,8 +164,9 @@
dontReregister.add(chan);
}
if (logDebug)Core.logger.log(this, "Cancelled
"+chan+": "+
-
k.isValid()+": "+k,
-
Logger.DEBUG);
+
(k==null?"(null)":
+
Boolean.toString(k.isValid()))
+
+":"+k, Logger.DEBUG);
}
} catch (OutOfMemoryError e) {
System.gc();
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
