Author: brandonwilliams Date: Thu Dec 1 20:37:37 2011 New Revision: 1209229
URL: http://svn.apache.org/viewvc?rev=1209229&view=rev Log: Prevent NPE when encryption options are missing. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3489 Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/Config.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/net/MessagingService.java Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/Config.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/Config.java?rev=1209229&r1=1209228&r2=1209229&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/Config.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/Config.java Thu Dec 1 20:37:37 2011 @@ -109,7 +109,7 @@ public class Config public RequestSchedulerId request_scheduler_id; public RequestSchedulerOptions request_scheduler_options; - public EncryptionOptions encryption_options; + public EncryptionOptions encryption_options = new EncryptionOptions(); public Integer index_interval = 128; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/net/MessagingService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/net/MessagingService.java?rev=1209229&r1=1209228&r2=1209229&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/net/MessagingService.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/net/MessagingService.java Thu Dec 1 20:37:37 2011 @@ -240,7 +240,7 @@ public final class MessagingService impl private List<ServerSocket> getServerSocket(InetAddress localEp) throws IOException, ConfigurationException { final List<ServerSocket> ss = new ArrayList<ServerSocket>(); - if (DatabaseDescriptor.getEncryptionOptions() != null && DatabaseDescriptor.getEncryptionOptions().internode_encryption != EncryptionOptions.InternodeEncryption.none) + if (DatabaseDescriptor.getEncryptionOptions().internode_encryption != EncryptionOptions.InternodeEncryption.none) { ss.add(SSLFactory.getServerSocket(DatabaseDescriptor.getEncryptionOptions(), localEp, DatabaseDescriptor.getSSLStoragePort())); // setReuseAddress happens in the factory.
