Author: jbellis Date: Thu Aug 11 19:16:21 2011 New Revision: 1156749 URL: http://svn.apache.org/viewvc?rev=1156749&view=rev Log: fix NPE when encryption_options is unspecified patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3007
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/MessagingService.java Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1156749&r1=1156748&r2=1156749&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Aug 11 19:16:21 2011 @@ -1,3 +1,7 @@ +0.8.5 + * fix NPE when encryption_options is unspecified (CASSANDRA-3007) + + 0.8.4 * include files-to-be-streamed in StreamInSession.getSources (CASSANDRA-2972) * use JAVA env var in cassandra-env.sh (CASSANDRA-2785, 2992) Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/MessagingService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/MessagingService.java?rev=1156749&r1=1156748&r2=1156749&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/MessagingService.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/MessagingService.java Thu Aug 11 19:16:21 2011 @@ -417,7 +417,8 @@ public final class MessagingService impl public void stream(StreamHeader header, InetAddress to) { /* Streaming asynchronously on streamExector_ threads. */ - if (DatabaseDescriptor.getEncryptionOptions().internode_encryption == EncryptionOptions.InternodeEncryption.all) + EncryptionOptions encryption = DatabaseDescriptor.getEncryptionOptions(); + if (encryption != null && encryption.internode_encryption == EncryptionOptions.InternodeEncryption.all) streamExecutor_.execute(new SSLFileStreamTask(header, to)); else streamExecutor_.execute(new FileStreamTask(header, to));