Skip to content

Commit f28d6cb

Browse files
weilipstanley-cheung
authored andcommitted
Fix rpc method name clashes. When multiple services in the same proto file define same rpc
1 parent 5d104af commit f28d6cb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

javascript/net/grpc/web/grpc_generator.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ void PrintMethodInfo(Printer* printer, std::map<string, string> vars) {
669669
" * !proto.$in$,\n"
670670
" * !proto.$out$>}\n"
671671
" */\n"
672-
"const methodInfo_$method_name$ = "
672+
"const methodInfo_$service_name$_$method_name$ = "
673673
"new grpc.web.AbstractClientBase.MethodInfo(\n");
674674
printer->Indent();
675675
printer->Print(
@@ -723,7 +723,7 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
723723
vars,
724724
"request,\n"
725725
"metadata,\n"
726-
"methodInfo_$method_name$,\n"
726+
"methodInfo_$service_name$_$method_name$,\n"
727727
"callback);\n");
728728
printer->Outdent();
729729
printer->Outdent();
@@ -793,7 +793,7 @@ void PrintServerStreamingCall(Printer* printer, std::map<string, string> vars) {
793793
vars,
794794
"request,\n"
795795
"metadata,\n"
796-
"methodInfo_$method_name$);\n");
796+
"methodInfo_$service_name$_$method_name$);\n");
797797
printer->Outdent();
798798
printer->Outdent();
799799
printer->Outdent();

0 commit comments

Comments
 (0)