natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Brandon Williams 2014-06-18 13:33:12 -05:00
parent d38f677c00 4b3a17cda6
commit 9d6afb4b75
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/net/MessagingService.java
View File

@ -466,7 +466,7 @@ public final class MessagingService implements MessagingServiceMBean
InetSocketAddress address = new InetSocketAddress(localEp, DatabaseDescriptor.getStoragePort());
try
{
socket.bind(address);
socket.bind(address,500);
}
catch (BindException e)
{

2
src/java/org/apache/cassandra/security/SSLFactory.java
View File

@ -56,7 +56,7 @@ public final class SSLFactory
String[] suits = filterCipherSuites(serverSocket.getSupportedCipherSuites(), options.cipher_suites);
serverSocket.setEnabledCipherSuites(suits);
serverSocket.setNeedClientAuth(options.require_client_auth);
serverSocket.bind(new InetSocketAddress(address, port), 100);
serverSocket.bind(new InetSocketAddress(address, port), 500);
return serverSocket;
}