Skip to content

Rolling back (Fix credential NPE)#1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garrettjonesgoogle merged 1 commit into from
Apr 21, 2017
Merged

Rolling back (Fix credential NPE) #1956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,12 +82,11 @@ public GrpcLoggingRpc(LoggingOptions options) throws IOException {
ChannelProvider channelProvider;
// todo(mziccard): ChannelProvider should support null/absent credentials for testing
if (options.getHost().contains("localhost")
|| NoCredentials.getInstance().equals(options.getCredentials())) {
ManagedChannel managedChannel =
ManagedChannelBuilder.forTarget(options.getHost())
.usePlaintext(true)
.executor(executor)
.build();
|| options.getCredentials().equals(NoCredentials.getInstance())) {
ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(options.getHost())
.usePlaintext(true)
.executor(executor)
.build();
channelProvider = FixedChannelProvider.create(managedChannel);
} else {
channelProvider = GrpcTransportOptions.setUpChannelProvider(
Expand Down