Author: tv
Date: Wed Apr 2 12:27:50 2014
New Revision: 1583996
URL: http://svn.apache.org/r1583996
Log:
Typo
Modified:
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
Modified:
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java?rev=1583996&r1=1583995&r2=1583996&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java
(original)
+++
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java
Wed Apr 2 12:27:50 2014
@@ -116,7 +116,7 @@ public class LateralUDPReceiver implemen
catch ( Exception e )
{
log.error( e );
- //throw new CacheException( "Error receving multicast packet", e);
+ //throw new CacheException( "Error receiving multicast packet", e);
}
return obj;
}
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java?rev=1583996&r1=1583995&r2=1583996&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Wed Apr 2 12:27:50 2014
@@ -75,7 +75,7 @@ public class LateralTCPListener<K extend
private ITCPLateralCacheAttributes tcpLateralCacheAttributes;
/** Listening port */
- protected int port;
+ private int port;
/** The processor. We should probably use an event queue here. */
protected ExecutorService pooledExecutor;
@@ -119,7 +119,6 @@ public class LateralTCPListener<K extend
ins = new LateralTCPListener<K, V>( ilca );
ins.init();
-
ins.setCacheManager( cacheMgr );
instances.put( String.valueOf( ilca.getTcpListenerPort() ), ins );
@@ -152,13 +151,18 @@ public class LateralTCPListener<K extend
{
this.port = getTcpLateralCacheAttributes().getTcpListenerPort();
- receiver = new ListenerThread();
- receiver.setDaemon( true );
- receiver.start();
-
pooledExecutor = Executors.newCachedThreadPool(new
MyThreadFactory());
terminated = false;
shutdown = false;
+
+ log.info( "Listening on port " + port );
+
+ ServerSocket serverSocket = new ServerSocket( port );
+ serverSocket.setSoTimeout( acceptTimeOut );
+
+ receiver = new ListenerThread(serverSocket);
+ receiver.setDaemon( true );
+ receiver.start();
}
catch ( Exception ex )
{
@@ -368,6 +372,8 @@ public class LateralTCPListener<K extend
{
terminated = true;
notify();
+
+ pooledExecutor.shutdownNow();
}
/**
@@ -467,19 +473,26 @@ public class LateralTCPListener<K extend
public class ListenerThread
extends Thread
{
+ /** The socket listener */
+ private ServerSocket serverSocket;
+
+ /**
+ * Constructor
+ *
+ * @param serverSocket
+ */
+ public ListenerThread(ServerSocket serverSocket)
+ {
+ super();
+ this.serverSocket = serverSocket;
+ }
+
/** Main processing method for the ListenerThread object */
@Override
public void run()
{
- ServerSocket serverSocket = null;
-
try
{
- log.info( "Listening on port " + port );
-
- serverSocket = new ServerSocket( port );
- serverSocket.setSoTimeout( acceptTimeOut );
-
ConnectionHandler handler;
outer: while ( true )
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java?rev=1583996&r1=1583995&r2=1583996&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
Wed Apr 2 12:27:50 2014
@@ -130,10 +130,8 @@ public class LateralTCPSender
{
socket.close();
}
- // Java 1.6+ only throw new IOException( "Cannot connect to "
+ host + ":" + port, ioe );
- final IOException ioException = new IOException( "Cannot
connect to " + host + ":" + port);
- ioException.initCause(ioe);
- throw ioException;
+
+ throw new IOException( "Cannot connect to " + host + ":" +
port, ioe );
}
socket.setSoTimeout( tcpLateralCacheAttributes.getSocketTimeOut()
);
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java?rev=1583996&r1=1583995&r2=1583996&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
Wed Apr 2 12:27:50 2014
@@ -184,7 +184,7 @@ public class UDPDiscoveryReceiver
}
catch ( Exception e )
{
- log.error( "Error receving multicast packet", e );
+ log.error( "Error receiving multicast packet", e );
}
return obj;
}
