Skip to content

Commit 918ac96

Browse files
committed
Do not connect datagram channel.
1 parent 137a651 commit 918ac96

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed

src/main/java/org/jsl/collider/ColliderImpl.java

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void runInThreadPool()
9797
{
9898
try
9999
{
100-
removeEmitter( emitter );
100+
removeEmitter(emitter);
101101
}
102102
catch (InterruptedException ex)
103103
{
@@ -114,7 +114,7 @@ public void runInThreadPool()
114114
{
115115
try
116116
{
117-
removeDatagramListener( datagramListener );
117+
removeDatagramListener(datagramListener);
118118
}
119119
catch (InterruptedException ex)
120120
{
@@ -132,7 +132,7 @@ public void runInThreadPool()
132132
}
133133

134134
/* No new session can appear now, can close all current. */
135-
executeInSelectorThread( new Stopper2() );
135+
executeInSelectorThread(new Stopper2());
136136
}
137137
}
138138

@@ -305,21 +305,21 @@ private void removeEmitter( SessionEmitter sessionEmitter ) throws InterruptedEx
305305
emitterImpl.stopAndWait();
306306
}
307307

308-
public void removeEmitterNoWait( final SessionEmitter sessionEmitter )
308+
public void removeEmitterNoWait(final SessionEmitter sessionEmitter)
309309
{
310310
/* Supposed to be called by SessionEmitterImpl itself. */
311311
m_lock.lock();
312312
try
313313
{
314-
m_emitters.remove( sessionEmitter );
314+
m_emitters.remove(sessionEmitter);
315315
}
316316
finally
317317
{
318318
m_lock.unlock();
319319
}
320320
}
321321

322-
public void removeDatagramListenerNoWait( final DatagramListener datagramListener )
322+
public void removeDatagramListenerNoWait(final DatagramListener datagramListener)
323323
{
324324
/* Supposed to be called by DatagramListenerImpl */
325325
m_lock.lock();
@@ -511,7 +511,7 @@ public void run()
511511
public void stop()
512512
{
513513
if (s_logger.isLoggable(Level.FINE))
514-
s_logger.fine( "" );
514+
s_logger.fine("");
515515

516516
m_lock.lock();
517517
try
@@ -525,10 +525,10 @@ public void stop()
525525
m_lock.unlock();
526526
}
527527

528-
executeInThreadPool( new Stopper1() );
528+
executeInThreadPool(new Stopper1());
529529
}
530530

531-
public final void executeInSelectorThread( SelectorThreadRunnable runnable )
531+
public final void executeInSelectorThread(SelectorThreadRunnable runnable)
532532
{
533533
assert( runnable.nextSelectorThreadRunnable == null );
534534
final SelectorThreadRunnable tail = s_strTailUpdater.getAndSet( this, runnable );
@@ -566,16 +566,16 @@ public final void executeInSelectorThreadNoWakeup( SelectorThreadRunnable runnab
566566
tail.nextSelectorThreadRunnable = runnable;
567567
}
568568

569-
public final void executeInSelectorThreadLater( SelectorThreadRunnable runnable )
569+
public final void executeInSelectorThreadLater(SelectorThreadRunnable runnable)
570570
{
571571
assert( runnable.nextSelectorThreadRunnable == null );
572572
runnable.nextSelectorThreadRunnable = m_strLater;
573573
m_strLater = runnable;
574574
}
575575

576-
public final void executeInThreadPool( ThreadPool.Runnable runnable )
576+
public final void executeInThreadPool(ThreadPool.Runnable runnable)
577577
{
578-
m_threadPool.execute( runnable );
578+
m_threadPool.execute(runnable);
579579
}
580580

581581
public void addAcceptor( Acceptor acceptor ) throws IOException
@@ -702,18 +702,17 @@ public void addDatagramListener(
702702
if (addr.getAddress().isMulticastAddress())
703703
{
704704
datagramChannel.close();
705-
throw new IOException( "addDatagramListener(" + addr + "): " +
706-
"addDatagramListener(DatagramListener, NetworkInterface) " +
707-
"should be used for multicast addresses." );
705+
throw new IOException("addDatagramListener(" + addr + "): "
706+
+ "addDatagramListener(DatagramListener, NetworkInterface) "
707+
+ "should be used for multicast addresses.");
708708
}
709-
datagramChannel.bind( addr );
710-
datagramChannel.connect( addr );
709+
datagramChannel.bind(addr);
711710
}
712711
else
713712
{
714-
datagramChannel.bind( new InetSocketAddress( addr.getPort() ) );
715-
datagramChannel.setOption( StandardSocketOptions.IP_MULTICAST_IF, networkInterface );
716-
membershipKey = datagramChannel.join( addr.getAddress(), networkInterface );
713+
datagramChannel.bind(new InetSocketAddress(addr.getPort()));
714+
datagramChannel.setOption(StandardSocketOptions.IP_MULTICAST_IF, networkInterface);
715+
membershipKey = datagramChannel.join(addr.getAddress(), networkInterface);
717716
}
718717

719718
int inputQueueBlockSize = datagramListener.inputQueueBlockSize;
@@ -753,11 +752,11 @@ public void addDatagramListener(
753752
try
754753
{
755754
if (m_stop)
756-
ex = new IOException( "Collider stopped" );
755+
ex = new IOException("Collider stopped");
757756
else if (m_datagramListeners.containsKey(datagramListener))
758-
ex = new IOException( "DatagramListener already registered." );
757+
ex = new IOException("DatagramListener already registered.");
759758
else
760-
m_datagramListeners.put( datagramListener, datagramListenerImpl );
759+
m_datagramListeners.put(datagramListener, datagramListenerImpl);
761760
}
762761
finally
763762
{
@@ -779,19 +778,19 @@ else if (m_datagramListeners.containsKey(datagramListener))
779778
{
780779
/* Should never happen */
781780
if (s_logger.isLoggable(Level.WARNING))
782-
s_logger.warning( ex1.toString() );
781+
s_logger.warning(ex1.toString());
783782
}
784783
throw ex;
785784
}
786785
}
787786

788-
public void removeDatagramListener( DatagramListener datagramListener) throws InterruptedException
787+
public void removeDatagramListener(DatagramListener datagramListener) throws InterruptedException
789788
{
790789
DatagramListenerImpl datagramListenerImpl;
791790
m_lock.lock();
792791
try
793792
{
794-
datagramListenerImpl = m_datagramListeners.get( datagramListener );
793+
datagramListenerImpl = m_datagramListeners.get(datagramListener);
795794
if (datagramListenerImpl == null)
796795
return;
797796
}

0 commit comments

Comments
 (0)