Remember loaded files earlier to prevent race conditions, fixes #501

protobufjs · Nov 29, 2016 · 3c16e46 · 3c16e46
1 parent 4012a00
commit 3c16e46
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/src/root.js b/src/root.js
@@ -80,12 +80,10 @@ RootPrototype.load = function load(filename, callback) {
         try {
             if (util.isString(source) && source.charAt(0) === "{")
                 source = JSON.parse(source);
-            if (!util.isString(source)) {
+            if (!util.isString(source))
                 self.setOptions(source.options).addJSON(source.nested);
-                self.files.push(filename);
-            } else {
+            else {
                 var parsed = require("./parse")(source, self);
-                self.files.push(filename);
                 if (parsed.imports)
                     parsed.imports.forEach(function(name) {
                         fetch(self.resolvePath(filename, name));
@@ -117,6 +115,7 @@ RootPrototype.load = function load(filename, callback) {
         // Skip if already loaded
         if (self.files.indexOf(filename) > -1)
             return;
+        self.files.push(filename);
 
         // Shortcut bundled definitions
         if (filename in common) {

diff --git a/tests/data/common.proto b/tests/data/common.proto
@@ -5,3 +5,6 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
+
+message Something {
+}
diff --git a/tests/data/file1.proto b/tests/data/file1.proto
@@ -0,0 +1 @@
+import "common.proto";
diff --git a/tests/data/file2.proto b/tests/data/file2.proto
@@ -0,0 +1 @@
+import "common.proto";