Mercurial > hg > RemoteEditor > Eclipse
changeset 199:61db2f70ceda
merge
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 03 Sep 2010 09:38:45 +0900 |
parents | 1f63cec3755c (diff) ca9f72b8b4ab (current diff) |
children | afa6f235d763 |
files | |
diffstat | 10 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/rep/channel/ServerChannelSimulator.java Tue Jan 20 18:42:28 2009 +0900 +++ b/src/rep/channel/ServerChannelSimulator.java Fri Sep 03 09:38:45 2010 +0900 @@ -45,23 +45,25 @@ return channel; } - protected boolean enQ(ChannelSimulator<P> ch){ + protected boolean enQ(ChannelSimulator<?> ch){ // Don't lock a selector from a locked channel, the selector may // use channel.isAble() which locks the channel. + @SuppressWarnings("unchecked") + ChannelSimulator<P>ch1 = (ChannelSimulator<P>)ch; synchronized(this) { - acceptQ.offer(ch); + acceptQ.offer(ch1); notify(); } selector.wakeup(); return true; } - - @SuppressWarnings("unchecked") - public void enQ(ChannelSimulator<?> hserver) { - // NetworkSimulator doesn't know P - ChannelSimulator<P>ch = (ChannelSimulator<P>) hserver; - enQ(ch); - } +// +// @SuppressWarnings("unchecked") +// public void enQ(ChannelSimulator<?> hserver) { +// // NetworkSimulator doesn't know P +// ChannelSimulator<P>ch = (ChannelSimulator<P>) hserver; +// enQ(ch); +// } public ServerSocket socket() { try {