[CVS spice] Remove debugging

pdonald-yCVjj/[email protected] 17 May 2004 05:41:50 -0000
Newsgroups gmane.comp.java.spice.cvs
Message-ID <[email protected]>
Commit in spice/sandbox/netevent/src/java/org/codehaus/spice/netevent/source on MAIN

SelectableChannelEventSource.java +15 -24 1.8 -> 1.9

Remove debugging

----------

spice/sandbox/netevent/src/java/org/codehaus/spice/netevent/source

SelectableChannelEventSource.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- SelectableChannelEventSource.java 26 Mar 2004 02:23:02 -0000 1.8
+++ SelectableChannelEventSource.java 17 May 2004 05:41:50 -0000 1.9
@@ -19,7 +19,7 @@

* An event source that generates events based from SelectableChannels.
*
* @author Peter Donald

- * @version $Revision: 1.8 $ $Date: 2004/03/26 02:23:02 $

+ * @version $Revision: 1.9 $ $Date: 2004/05/17 05:41:50 $

*/
public class SelectableChannelEventSource
extends AbstractEventSource

@@ -61,10 +61,9 @@

* @return the SelectionKey
* @throws IOException if unable to register with source
*/

- public synchronized SelectionKey
- registerChannel( final SelectableChannel channel,
- final int ops,
- final Object userData )

+ public synchronized SelectionKey registerChannel( final SelectableChannel channel,
+ final int ops,
+ final Object userData )

throws IOException
{
if( null == _selector )

@@ -100,12 +99,7 @@

* @see AbstractEventSource#refresh()
*/
protected void refresh()

- {
- System.out.println("Refresh chan .... " +
- "in " + Thread.currentThread().getName() +
- " _selectTimeout=" + _selectTimeout +
- " _selector.keys().size()=" + _selector.keys().size() );
-

+ {

final Selector selector;
synchronized( this )
{

@@ -137,7 +131,7 @@

// Walk through the ready keys collection and process date requests.
while( iterator.hasNext() )
{

- final SelectionKey key = (SelectionKey)iterator.next();

+ final SelectionKey key = (SelectionKey) iterator.next();

iterator.remove();
handleSelectorEvent( key );
}

@@ -158,30 +152,27 @@

if( key.isAcceptable() )
{

- final ServerSocketChannel channel =
- (ServerSocketChannel)key.channel();
- final AcceptPossibleEvent event =
- new AcceptPossibleEvent( channel, userData );

+ final ServerSocketChannel channel = (ServerSocketChannel) key.channel();
+ final AcceptPossibleEvent event = new AcceptPossibleEvent( channel, userData );

getJoin().addEvent( event );
}
if( key.isWritable() )
{

- final ChannelTransport transport = (ChannelTransport)userData;
- final WritePossibleEvent event =
- new WritePossibleEvent( transport );

+ final ChannelTransport transport = (ChannelTransport) userData;
+ final WritePossibleEvent event = new WritePossibleEvent( transport );

getJoin().addEvent( event );
}
if( key.isReadable() )
{

- final ChannelTransport transport = (ChannelTransport)userData;
- final ReadPossibleEvent event =
- new ReadPossibleEvent( transport );

+ final ChannelTransport transport = (ChannelTransport) userData;
+ final ReadPossibleEvent event = new ReadPossibleEvent( transport );

getJoin().addEvent( event );
}
if( key.isConnectable() )
{

- final ConnectPossibleEvent event =
- new ConnectPossibleEvent( key.channel(), userData, key );

+ final ConnectPossibleEvent event = new ConnectPossibleEvent( key.channel(),
+ userData,
+ key );

getJoin().addEvent( event );
}
}

CVSspam 0.2.8