fix credentials NPE bug #1565

neozwu · neozwu · commit c3529a4ceef5 · 2017-04-21T09:31:31.000-07:00
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -19,7 +19,6 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.core.ApiClock;
 import com.google.api.core.CurrentMillisClock;
@@ -37,12 +36,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Locale;
 import java.util.Objects;
@@ -461,6 +457,17 @@ public Credentials getCredentials() {
     return credentials;
   }
 
+  /**
+   * Returns whether the credential is {@code NoCredentials} instance
+   * @return true if credential is a {@code NoCredentials} instance, false if not
+   */
+  public boolean credentialIsNoCredentialInstance() {
+    if (credentials != null) {
+      return credentials.equals(NoCredentials.getInstance());
+    }
+    return false;
+  }
+
   /**
    * Returns the authentication credentials. If required, credentials are scoped.
    */
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
@@ -28,7 +28,6 @@
 import com.google.api.gax.grpc.UnaryCallSettings;
 import com.google.cloud.GrpcTransportOptions;
 import com.google.cloud.GrpcTransportOptions.ExecutorFactory;
-import com.google.cloud.NoCredentials;
 import com.google.cloud.logging.LoggingException;
 import com.google.cloud.logging.LoggingOptions;
 import com.google.logging.v2.CreateLogMetricRequest;
@@ -82,7 +81,7 @@ public GrpcLoggingRpc(LoggingOptions options) throws IOException {
       ChannelProvider channelProvider;
       // todo(mziccard): ChannelProvider should support null/absent credentials for testing
       if (options.getHost().contains("localhost")
-          || options.getCredentials().equals(NoCredentials.getInstance())) {
+          || options.credentialIsNoCredentialInstance()) {
         ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(options.getHost())
             .usePlaintext(true)
             .executor(executor)
