Fixed connection policy toString NPE (Azure#11781)

eboyd23 · Jun 8, 2020 · 092f109 · 092f109
1 parent eba5c1e
commit 092f109
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ConnectionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ConnectionPolicy.java
@@ -457,8 +457,8 @@ public String toString() {
             ", endpointDiscoveryEnabled=" + endpointDiscoveryEnabled +
             ", preferredRegions=" + preferredRegions +
             ", multipleWriteRegionsEnabled=" + multipleWriteRegionsEnabled +
-            ", proxyType=" + proxy.getType() +
-            ", inetSocketProxyAddress=" + proxy.getAddress() +
+            ", proxyType=" + (proxy != null ? proxy.getType() : null) +
+            ", inetSocketProxyAddress=" + (proxy != null ? proxy.getAddress() : null) +
             ", readRequestsFallbackEnabled=" + readRequestsFallbackEnabled +
             ", connectTimeout=" + connectTimeout +
             ", idleEndpointTimeout=" + idleEndpointTimeout +

diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConnectionPolicyTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ConnectionPolicyTest.java
@@ -43,4 +43,16 @@ public void usingMultipleWriteRegions() {
         policy.setMultipleWriteRegionsEnabled(false);
         assertThat(policy.isMultipleWriteRegionsEnabled()).isEqualTo(false);
     }
+
+    @Test(groups = { "unit" })
+    public void connectionPolicyDirectConnectionToString() {
+        ConnectionPolicy policy = new ConnectionPolicy(DirectConnectionConfig.getDefaultConfig());
+        assertThat(policy.toString()).isNotEmpty();
+    }
+
+    @Test(groups = { "unit" })
+    public void connectionPolicyGatewayConnectionToString() {
+        ConnectionPolicy policy = new ConnectionPolicy(GatewayConnectionConfig.getDefaultConfig());
+        assertThat(policy.toString()).isNotEmpty();
+    }
 }