svn commit: r1139383 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java

[jbellis]

Author: jbellis
Date: Fri Jun 24 16:48:08 2011
New Revision: 1139383

URL: http://svn.apache.org/viewvc?rev=1139383&view=rev
Log:
tolerate missing encryption options
patch by jbellis; reviewed by slebresne for CASSANDRA-2822

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

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=1139383&r1=1139382&r2=1139383&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 Fri Jun 24 16:48:08 2011
@@ -165,9 +165,10 @@ public class OutboundTcpConnection exten
             try
             {
                 // zero means 'bind on any available port.'
-                if 
(DatabaseDescriptor.getEncryptionOptions().internode_encryption == 
EncryptionOptions.InternodeEncryption.all)
+                EncryptionOptions options = 
DatabaseDescriptor.getEncryptionOptions();
+                if (options != null && options.internode_encryption == 
EncryptionOptions.InternodeEncryption.all)
                 {
-                    socket = 
SSLFactory.getSocket(DatabaseDescriptor.getEncryptionOptions(), endpoint, 
DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
+                    socket = SSLFactory.getSocket(options, endpoint, 
DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
                 }
                 else {
                     socket = new Socket(endpoint, 
DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);