File protobuf-4e93585e8bb234efeacb7737b8d080968c5ab91e.patch of Package protobuf.26315

From 4e93585e8bb234efeacb7737b8d080968c5ab91e Mon Sep 17 00:00:00 2001
From: Rafi Kamal <rafikamal@google.com>
Date: Fri, 15 Nov 2019 10:40:11 -0800
Subject: [PATCH] Down integrate to GitHub (#6893)

---
 src/google/protobuf/compiler/java/java_helpers.h        |    1 +
 src/google/protobuf/compiler/java/java_name_resolver.cc |    6 +++---
 src/google/protobuf/compiler/java/java_name_resolver.h  |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

--- a/src/google/protobuf/compiler/java/java_helpers.h
+++ b/src/google/protobuf/compiler/java/java_helpers.h
@@ -160,6 +160,7 @@ inline bool MultipleJavaFiles(const File
   return descriptor->options().java_multiple_files();
 }
 
+
 // Returns true if `descriptor` will be written to its own .java file.
 // `immutable` should be set to true if we're generating for the immutable API.
 template <typename Descriptor>
--- a/src/google/protobuf/compiler/java/java_name_resolver.cc
+++ b/src/google/protobuf/compiler/java/java_name_resolver.cc
@@ -212,9 +212,9 @@ std::string ClassNameResolver::GetClassN
 // or outer class name.
 std::string ClassNameResolver::GetClassFullName(
     const std::string& name_without_package, const FileDescriptor* file,
-    bool immutable, bool multiple_files) {
+    bool immutable, bool is_own_file) {
   std::string result;
-  if (multiple_files) {
+  if (is_own_file) {
     result = FileJavaPackage(file, immutable);
   } else {
     result = GetClassName(file, immutable);
@@ -244,7 +244,7 @@ std::string ClassNameResolver::GetClassN
                                             bool immutable) {
   return GetClassFullName(ClassNameWithoutPackage(descriptor, immutable),
                           descriptor->file(), immutable,
-                          MultipleJavaFiles(descriptor->file(), immutable));
+                          IsOwnFile(descriptor, immutable));
 }
 
 // Get the Java Class style full name of a message.
--- a/src/google/protobuf/compiler/java/java_name_resolver.h
+++ b/src/google/protobuf/compiler/java/java_name_resolver.h
@@ -108,7 +108,7 @@ class ClassNameResolver {
   // or outer class name.
   std::string GetClassFullName(const std::string& name_without_package,
                                const FileDescriptor* file, bool immutable,
-                               bool multiple_files);
+                               bool is_own_file);
   // Get the Java Class style full name of a message.
   std::string GetJavaClassFullName(const std::string& name_without_package,
                                    const FileDescriptor* file, bool immutable);