Fix for #126

- NPE if options is missing in river settings.
richardwilly98 · Sep 18, 2013 · f9d782f · f9d782f
1 parent 90554df
commit f9d782f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/org/elasticsearch/river/mongodb/MongoDBRiverDefinition.java b/src/main/java/org/elasticsearch/river/mongodb/MongoDBRiverDefinition.java
@@ -355,6 +355,10 @@ public synchronized static MongoDBRiverDefinition parseSettings(
 			}
 			builder.mongoServers(mongoServers);
 
+			MongoClientOptions.Builder mongoClientOptionsBuilder = MongoClientOptions
+					.builder().autoConnectRetry(true)
+					.socketKeepAlive(true);
+
 			// MongoDB options
 			if (mongoSettings.containsKey(OPTIONS_FIELD)) {
 				Map<String, Object> mongoOptionsSettings = (Map<String, Object>) mongoSettings
@@ -377,10 +381,8 @@ public synchronized static MongoDBRiverDefinition parseSettings(
 						.nodeBooleanValue(mongoOptionsSettings
 								.get(ADVANCED_TRANSFORMATION_FIELD), false));
 
-				MongoClientOptions.Builder mongoClientOptionsBuilder = MongoClientOptions
-						.builder().autoConnectRetry(true)
+				mongoClientOptionsBuilder
 						.connectTimeout(builder.connectTimeout)
-						.socketKeepAlive(true)
 						.socketTimeout(builder.socketTimeout);
 
 				if (builder.mongoSecondaryReadPreference) {
@@ -392,8 +394,6 @@ public synchronized static MongoDBRiverDefinition parseSettings(
 							.socketFactory(getSSLSocketFactory());
 				}
 
-				builder.mongoClientOptions(mongoClientOptionsBuilder.build());
-
 				if (mongoOptionsSettings.containsKey(PARENT_TYPES_FIELD)) {
 					Set<String> parentTypes = new HashSet<String>();
 					Object parentTypesSettings = mongoOptionsSettings
@@ -497,6 +497,7 @@ public synchronized static MongoDBRiverDefinition parseSettings(
 					}
 				}
 			}
+			builder.mongoClientOptions(mongoClientOptionsBuilder.build());
 
 			// Credentials
 			if (mongoSettings.containsKey(CREDENTIALS_FIELD)) {

diff --git a/src/test/java/org/elasticsearch/river/mongodb/simple/test-simple-mongodb-river.json b/src/test/java/org/elasticsearch/river/mongodb/simple/test-simple-mongodb-river.json
@@ -13,9 +13,6 @@
 			"host": "localhost",
 			"port": %s
 		}],
-		"options": {
-			"secondary_read_preference": true
-		},
 		"db": "%s",
 		"collection": "%s",
 		"gridfs": false