Fix rpc method name clashes. When multiple services in the same proto…

… file define same rpc
grpc · Nov 9, 2018 · f28d6cb · f28d6cb
1 parent 5d104af
commit f28d6cb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/javascript/net/grpc/web/grpc_generator.cc b/javascript/net/grpc/web/grpc_generator.cc
@@ -669,7 +669,7 @@ void PrintMethodInfo(Printer* printer, std::map<string, string> vars) {
       " *   !proto.$in$,\n"
       " *   !proto.$out$>}\n"
       " */\n"
-      "const methodInfo_$method_name$ = "
+      "const methodInfo_$service_name$_$method_name$ = "
       "new grpc.web.AbstractClientBase.MethodInfo(\n");
   printer->Indent();
   printer->Print(
@@ -723,7 +723,7 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
       vars,
       "request,\n"
       "metadata,\n"
-      "methodInfo_$method_name$,\n"
+      "methodInfo_$service_name$_$method_name$,\n"
       "callback);\n");
   printer->Outdent();
   printer->Outdent();
@@ -793,7 +793,7 @@ void PrintServerStreamingCall(Printer* printer, std::map<string, string> vars) {
       vars,
       "request,\n"
       "metadata,\n"
-      "methodInfo_$method_name$);\n");
+      "methodInfo_$service_name$_$method_name$);\n");
   printer->Outdent();
   printer->Outdent();
   printer->Outdent();