diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-01 07:36:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-01 07:36:36 +0000 |
| commit | 66378961dddcc0c38e10e2635ac5c42bc4b31955 (patch) | |
| tree | 6ff82fc87e6e82e78b26cc4d12704b86b2b2f377 | |
| parent | 03d979bc7c14bd9ceb817ca45cd1ee7f4a6cb5cc (diff) | |
| parent | 1ee0c0718b5cfeea7b5bf035c0c5405bbdb9fb88 (diff) | |
| download | protobuf-66378961dddcc0c38e10e2635ac5c42bc4b31955.tar.gz | |
release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release-4057695 snap-temp-L92600000069427650
Change-Id: I4d41f2e00475aa6f409158fbceb754b7dd5befcc
| -rw-r--r-- | src/google/protobuf/compiler/java/java_shared_code_generator.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/java/java_shared_code_generator.cc b/src/google/protobuf/compiler/java/java_shared_code_generator.cc index 74253c3fb..b5b503a59 100644 --- a/src/google/protobuf/compiler/java/java_shared_code_generator.cc +++ b/src/google/protobuf/compiler/java/java_shared_code_generator.cc @@ -169,9 +169,11 @@ void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) { for (int i = 0; i < file_->dependency_count(); i++) { if (ShouldIncludeDependency(file_->dependency(i))) { string filename = file_->dependency(i)->name(); - string classname = FileJavaPackage(file_->dependency(i)) + "." + - name_resolver_->GetDescriptorClassName( - file_->dependency(i)); + string classname = FileJavaPackage(file_->dependency(i)); + if (!classname.empty()) { + classname += "."; + } + classname += name_resolver_->GetDescriptorClassName(file_->dependency(i)); dependencies.push_back(std::make_pair(filename, classname)); } } |