Merge branch 'master' into CPP-803

Author: Michael Penick

cpp-driver/gtests/src/unit/tests/test_cluster.cpp

@@ -1010,3 +1010,21 @@ TEST_F(ClusterUnitTest, LocalDcFromResolver) {
   EXPECT_FALSE(connect_future->error());
   ASSERT_EQ("this_local_dc", connect_future->cluster()->local_dc());
 }
+
+TEST_F(ClusterUnitTest, NoContactPoints) {
+  // No cluster needed
+
+  AddressVec contact_points; // Empty
+
+  Future::Ptr connect_future(new Future());
+  ClusterConnector::Ptr connector(
+      new ClusterConnector(contact_points, PROTOCOL_VERSION,
+                           bind_callback(on_connection_connected, connect_future.get())));
+  connector->connect(event_loop());
+
+  ASSERT_TRUE(connect_future->wait_for(WAIT_FOR_TIME))
+      << "Timed out waiting for cluster to connect";
+  ASSERT_TRUE(connect_future->error());
+  EXPECT_EQ(connect_future->error()->code, CASS_ERROR_LIB_NO_HOSTS_AVAILABLE);
+}
+

cpp-driver/gtests/src/unit/tests/test_session.cpp

@@ -830,3 +830,18 @@ TEST_F(SessionUnitTest, LocalDcNotOverriddenOnPolicyUsingExecutionProfiles) {
 
   ASSERT_EQ(0u, listener->event_count());
 }
+
+TEST_F(SessionUnitTest, NoContactPoints) {
+  // No cluster needed
+
+  Config config;
+  config.contact_points().clear();
+
+  Session session;
+  Future::Ptr connect_future(session.connect(config));
+  ASSERT_TRUE(connect_future->wait_for(WAIT_FOR_TIME))
+      << "Timed out waiting for session to connect";
+  ASSERT_TRUE(connect_future->error());
+  EXPECT_EQ(connect_future->error()->code, CASS_ERROR_LIB_NO_HOSTS_AVAILABLE);
+}
+

cpp-driver/src/cloud_secure_connection_config.cpp

@@ -237,8 +237,10 @@ bool CloudSecureConnectionConfig::load(const String& filename, Config* config /*
     return false;
   }
 
+  json::MemoryStream memory_stream(contents.c_str(), contents.size());
+  json::AutoUTFMemoryInputStream auto_utf_stream(memory_stream);
   json::Document document;
-  document.Parse(contents.c_str());
+  document.ParseStream(auto_utf_stream);
   if (!document.IsObject()) {
     LOG_ERROR(CLOUD_ERROR "Invalid configuration");
     return false;

cpp-driver/src/cluster_connector.cpp

@@ -104,9 +104,7 @@ Cluster::Ptr ClusterConnector::release_cluster() {
 void ClusterConnector::internal_resolve_and_connect() {
   inc_ref();
 
-  assert(!contact_points_.empty() && "Contact points should never be empty");
-
-  if (random_) {
+  if (random_ && !contact_points_.empty()) {
     random_shuffle(contact_points_.begin(), contact_points_.end(), random_);
   }
 

cpp-driver/src/json.hpp

@@ -73,10 +73,12 @@ class Allocator {
 
 typedef datastax::rapidjson::UTF8<> UTF8;
 typedef datastax::rapidjson::MemoryPoolAllocator<json::Allocator> MemoryPoolAllocator;
+typedef datastax::rapidjson::MemoryStream MemoryStream;
 
 typedef datastax::rapidjson::GenericDocument<UTF8, MemoryPoolAllocator, json::Allocator> Document;
 typedef datastax::rapidjson::GenericValue<UTF8, MemoryPoolAllocator> Value;
 typedef datastax::rapidjson::GenericStringBuffer<UTF8, json::Allocator> StringBuffer;
+typedef datastax::rapidjson::AutoUTFInputStream<unsigned, MemoryStream> AutoUTFMemoryInputStream;
 
 template <typename OutputStream, typename SourceEncoding = UTF8, typename TargetEncoding = UTF8,
           typename StackAllocator = json::Allocator,