svn commit: r1069520 - in /cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/net/MessagingService.java

[gd...@apache.org]

Author: gdusbabek
Date: Thu Feb 10 18:43:13 2011
New Revision: 1069520

URL: http://svn.apache.org/viewvc?rev=1069520&view=rev
Log:
check for null encryption in MessagingService. patch by Nate McCall, reviewed by gdusbabek. CASSANDRA-2152

Modified:
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java

Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1069520&r1=1069519&r2=1069520&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Feb 10 18:43:13 2011
@@ -7,6 +7,7 @@
  * human readable column names in sstable2json output (CASSANDRA-1933)
  * change default JMX port to 7199 (CASSANDRA-2027)
  * backwards compatible internal messaging (CASSANDRA-1015)
+ * check for null encryption in MessagingService (CASSANDRA-2152)
 
 
 0.7.2

Modified: cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=1069520&r1=1069519&r2=1069520&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Thu Feb 10 18:43:13 2011
@@ -189,7 +189,7 @@ public final class MessagingService impl
     private ServerSocket getServerSocket(InetAddress localEp) throws IOException, ConfigurationException
     {
         final ServerSocket ss;
-        if (DatabaseDescriptor.getEncryptionOptions().internode_encryption == EncryptionOptions.InternodeEncryption.all)
+        if (DatabaseDescriptor.getEncryptionOptions() != null && DatabaseDescriptor.getEncryptionOptions().internode_encryption == EncryptionOptions.InternodeEncryption.all)
         {
             ss = SSLFactory.getServerSocket(DatabaseDescriptor.getEncryptionOptions(), localEp, DatabaseDescriptor.getStoragePort());
             // setReuseAddress happens in the factory.