organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #3176 from acozzette/fix-3114

Browse source 
Ensure that for Java, imports of .proto files with empty packages works
This commit is contained in:
Adam Cozzette 2017-06-07 15:15:34 -07:00 • committed by GitHub
commit 96095f3a85
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/google/protobuf/compiler/java/java_shared_code_generator.cc
View file

@ -182,10 +182,16 @@ void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) {
std::vector<std::pair<string, string> > dependencies;
for (int i = 0; i < file_->dependency_count(); i++) {
string filename = file_->dependency(i)->name();
string classname = FileJavaPackage(file_->dependency(i)) + "." +
name_resolver_->GetDescriptorClassName(
file_->dependency(i));
dependencies.push_back(std::make_pair(filename, classname));
string package = FileJavaPackage(file_->dependency(i));
string classname = name_resolver_->GetDescriptorClassName(
file_->dependency(i));
string full_name;
if (package.empty()) {
full_name = classname;
} else {
full_name = package + "." + classname;
}
dependencies.push_back(std::make_pair(filename, full_name));
}
// -----------------------------------------------------------------