Author: nextgens
Date: 2009-04-17 20:09:16 +0000 (Fri, 17 Apr 2009)
New Revision: 26954
Modified:
branches/nextgens-stuffs/freenet/src/freenet/io/comm/MessageCore.java
Log:
Some sugar; don't keep the ReadWriteLock
Modified: branches/nextgens-stuffs/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- branches/nextgens-stuffs/freenet/src/freenet/io/comm/MessageCore.java
2009-04-17 20:07:41 UTC (rev 26953)
+++ branches/nextgens-stuffs/freenet/src/freenet/io/comm/MessageCore.java
2009-04-17 20:09:16 UTC (rev 26954)
@@ -52,10 +52,9 @@
}
private Dispatcher _dispatcher;
- /** lock serves as lock for both */
- private final ReadWriteLock messageFiltersLock = new
ReentrantReadWriteLock();
- private final Lock messageFiltersReadLock =
messageFiltersLock.readLock();
- private final Lock messageFiltersWriteLock =
messageFiltersLock.writeLock();
+ private final Lock messageFiltersReadLock;
+ private final Lock messageFiltersWriteLock;
+ /** messageFiltersLock serves as lock for both _filters and _unclaimed
*/
private final Map<PeerContext, LinkedList<MessageFilter>> _filters =
new TreeMap<PeerContext,LinkedList<MessageFilter>>();
private final LinkedList<Message> _unclaimed = new
LinkedList<Message>();
private static final int MAX_UNMATCHED_FIFO_SIZE = 50000;
@@ -70,6 +69,9 @@
public MessageCore() {
_timedOutFilters = new Vector<MessageFilter>(32);
+ ReadWriteLock messageFiltersLock = new
ReentrantReadWriteLock(true);
+ messageFiltersReadLock = messageFiltersLock.readLock();
+ messageFiltersWriteLock = messageFiltersLock.writeLock();
}
/**
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
