Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit 6cf970c67164 · 2018-11-29T22:19:52.000-08:00
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/TypeResolver.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/TypeResolver.java
@@ -172,14 +172,9 @@ private ProtobufMessage _findResolvedMessage(String typeStr)
         }
         return msg;
     }
-int depth = 0;
-    
+
     private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)
     {
-        ++depth;
-        try {
-if (depth > 20) throw new Error("StackOverflow");
-System.err.println("_findAnyResolved("+depth+", '"+typeStr+"')");
         ProtobufField f = _findLocalResolved(nativeField, typeStr);
         if (f == null) {
             MessageElement nativeMt = _nativeMessageTypes.get(typeStr);
@@ -192,9 +187,6 @@ private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)
             }
         }
         return f;
-        } finally {
-            --depth;
-        }
     }
 
     private StringBuilder _knownEnums(StringBuilder sb) {

Original file line number	Diff line number	Diff line change
`@@ -172,14 +172,9 @@ private ProtobufMessage _findResolvedMessage(String typeStr)`
`172`	`172`	`}`
`173`	`173`	`return msg;`
`174`	`174`	`}`
`175`		`-int depth = 0;`
`176`		`-`
	`175`	`+`
`177`	`176`	`private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)`
`178`	`177`	`{`
`179`		`- ++depth;`
`180`		`- try {`
`181`		`-if (depth > 20) throw new Error("StackOverflow");`
`182`		`-System.err.println("_findAnyResolved("+depth+", '"+typeStr+"')");`
`183`	`178`	`ProtobufField f = _findLocalResolved(nativeField, typeStr);`
`184`	`179`	`if (f == null) {`
`185`	`180`	`MessageElement nativeMt = _nativeMessageTypes.get(typeStr);`
`@@ -192,9 +187,6 @@ private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)`
`192`	`187`	`}`
`193`	`188`	`}`
`194`	`189`	`return f;`
`195`		`- } finally {`
`196`		`- --depth;`
`197`		`- }`
`198`	`190`	`}`
`199`	`191`
`200`	`192`	`private StringBuilder _knownEnums(StringBuilder sb) {`