svn commit: r1171091 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java

[jbellis]

Author: jbellis
Date: Thu Sep 15 13:31:50 2011
New Revision: 1171091

URL: http://svn.apache.org/viewvc?rev=1171091&view=rev
Log:
Accomodate missing encryption_options in IncomingTcpConnection.stream
patch by jbellis; reviewed by slebresne for CASSANDRA-3212

Modified:
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=1171091&r1=1171090&r2=1171091&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
 Thu Sep 15 13:31:50 2011
@@ -182,7 +182,8 @@ public class IncomingTcpConnection exten
 
     private void stream(StreamHeader streamHeader, DataInputStream input) 
throws IOException
     {
-        if (DatabaseDescriptor.getEncryptionOptions().internode_encryption == 
EncryptionOptions.InternodeEncryption.all)
+        EncryptionOptions options = DatabaseDescriptor.getEncryptionOptions();
+        if (options != null && options.internode_encryption == 
EncryptionOptions.InternodeEncryption.all)
             new SSLIncomingStreamReader(streamHeader, socket, input).read();
         else
             new IncomingStreamReader(streamHeader, socket).read();