Merge branch 'master' into channel-cq-scq-impl

pull/19067/head
Karthik Ravi Shankar 6 years ago
commit 430447d403
  1. 2
      src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
  2. 2
      templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
  3. 2
      test/cpp/codegen/compiler_test_golden
  4. 2
      tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh

@ -175,11 +175,13 @@ void FakeResolverResponseGenerator::SetResponseLocked(void* arg,
resolver->next_result_ = std::move(closure_arg->result); resolver->next_result_ = std::move(closure_arg->result);
resolver->has_next_result_ = true; resolver->has_next_result_ = true;
resolver->MaybeSendResultLocked(); resolver->MaybeSendResultLocked();
closure_arg->generator->Unref();
Delete(closure_arg); Delete(closure_arg);
} }
void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) { void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) {
if (resolver_ != nullptr) { if (resolver_ != nullptr) {
Ref().release(); // ref to be held by closure
SetResponseClosureArg* closure_arg = New<SetResponseClosureArg>(); SetResponseClosureArg* closure_arg = New<SetResponseClosureArg>();
closure_arg->generator = this; closure_arg->generator = this;
closure_arg->result = std::move(result); closure_arg->result = std::move(result);

@ -38,7 +38,5 @@
then then
ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi fi
./build/get-grpc.sh
dotnet build --configuration Debug Grpc.AspNetCore.sln dotnet build --configuration Debug Grpc.AspNetCore.sln

@ -52,6 +52,8 @@ template <typename RequestT, typename ResponseT>
class MessageAllocator; class MessageAllocator;
} // namespace experimental } // namespace experimental
class Channel; class Channel;
class CompletionQueue;
class ServerCompletionQueue;
class ServerContext; class ServerContext;
} // namespace grpc } // namespace grpc

@ -37,6 +37,4 @@ then
ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi fi
./build/get-grpc.sh
dotnet build --configuration Debug Grpc.AspNetCore.sln dotnet build --configuration Debug Grpc.AspNetCore.sln

Loading…
Cancel
Save