From 9bfed46c41a54c49c12130a787e1ed706290c89e Mon Sep 17 00:00:00 2001 From: ming Date: Tue, 19 Jun 2018 07:20:31 +0800 Subject: check provided size --- src/google/protobuf/compiler/js/js_generator.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index d8282e40..d64cb7dc 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -3477,7 +3477,8 @@ void Generator::GenerateFile(const GeneratorOptions& options, GenerateExtension(options, printer, *it); } - if (options.import_style == GeneratorOptions::kImportCommonJs) { + // if provided is empty, do not export anything + if (options.import_style == GeneratorOptions::kImportCommonJs && provided.size()) { printer->Print("goog.object.extend(exports, $package$);\n", "package", GetFilePath(options, file)); } -- cgit v1.2.3 From 6074aaa988742a8d6de7010e7971c360689a67d6 Mon Sep 17 00:00:00 2001 From: ming Date: Tue, 19 Jun 2018 11:47:21 +0800 Subject: not empty --- src/google/protobuf/compiler/js/js_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index d64cb7dc..7109ed5b 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -3478,7 +3478,7 @@ void Generator::GenerateFile(const GeneratorOptions& options, } // if provided is empty, do not export anything - if (options.import_style == GeneratorOptions::kImportCommonJs && provided.size()) { + if (options.import_style == GeneratorOptions::kImportCommonJs && !provided.empty()) { printer->Print("goog.object.extend(exports, $package$);\n", "package", GetFilePath(options, file)); } -- cgit v1.2.3