Skip to content

Commit 6cf970c

Browse files
committed
Merge branch '2.9' into 2.10
2 parents 04ff0af + 5f4f826 commit 6cf970c

File tree

1 file changed

+1
-9
lines changed
  • protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema

1 file changed

+1
-9
lines changed

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/TypeResolver.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,9 @@ private ProtobufMessage _findResolvedMessage(String typeStr)
172172
}
173173
return msg;
174174
}
175-
int depth = 0;
176-
175+
177176
private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)
178177
{
179-
++depth;
180-
try {
181-
if (depth > 20) throw new Error("StackOverflow");
182-
System.err.println("_findAnyResolved("+depth+", '"+typeStr+"')");
183178
ProtobufField f = _findLocalResolved(nativeField, typeStr);
184179
if (f == null) {
185180
MessageElement nativeMt = _nativeMessageTypes.get(typeStr);
@@ -192,9 +187,6 @@ private ProtobufField _findAnyResolved(FieldElement nativeField, String typeStr)
192187
}
193188
}
194189
return f;
195-
} finally {
196-
--depth;
197-
}
198190
}
199191

200192
private StringBuilder _knownEnums(StringBuilder sb) {

0 commit comments

Comments
 (0)