Skip to content

Commit f27350b

Browse files
internal changes
PiperOrigin-RevId: 891900837
1 parent 4c83348 commit f27350b

4 files changed

Lines changed: 7 additions & 10 deletions

File tree

java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,8 @@ void parseLengthPrefixedMessageSetItem(
494494
} else {
495495
extensions.setField(
496496
extensionInfo.descriptor,
497-
new LazyField(extensionInfo.defaultInstance, extensionRegistry, reader.readBytes()));
497+
new LazyField(
498+
extensionInfo.defaultInstance, extensionRegistry, reader.readBytes()));
498499
}
499500
}
500501

java/core/src/main/java/com/google/protobuf/FieldSet.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,6 @@ public Object getField(final T descriptor) {
273273
return o;
274274
}
275275

276-
/** Returns true if the field is a lazy field and it is corrupted. */
277-
boolean lazyFieldCorrupted(final T descriptor) {
278-
Object o = fields.get(descriptor);
279-
return o instanceof LazyField && ((LazyField) o).isCorrupted();
280-
}
281-
282276
/**
283277
* Useful for implementing {@link Message.Builder#setField(Descriptors.FieldDescriptor,Object)}.
284278
*/
@@ -838,7 +832,8 @@ private int getMessageSetSerializedSize(final Map.Entry<T, Object> entry) {
838832
&& !descriptor.isRepeated()
839833
&& !descriptor.isPacked()) {
840834
if (value instanceof LazyField) {
841-
return ((LazyField) value).computeMessageSetExtensionSize(entry.getKey().getNumber());
835+
return ((LazyField) value)
836+
.computeMessageSetExtensionSize(entry.getKey().getNumber());
842837
} else {
843838
return CodedOutputStream.computeMessageSetExtensionSize(
844839
entry.getKey().getNumber(), (MessageLite) value);

java/core/src/main/java/com/google/protobuf/MessageReflection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,8 @@ private static void mergeMessageSetExtensionFromBytes(
13771377
target.setField(field, value);
13781378
} else {
13791379
// Use LazyField to load MessageSet lazily.
1380-
LazyField lazyField = new LazyField(extension.defaultInstance, extensionRegistry, rawBytes);
1380+
LazyField lazyField =
1381+
new LazyField(extension.defaultInstance, extensionRegistry, rawBytes);
13811382
target.setField(field, lazyField);
13821383
}
13831384
}

java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public void testBuilderGetRepeatedFieldBuilder_mapField_throwsUnsupportedOperati
385385
new ThrowingRunnable() {
386386
@Override
387387
public void run() throws Throwable {
388-
builder.getFieldBuilder(mapField);
388+
builder.getFieldBuilder(mapField);
389389
}
390390
});
391391
}

0 commit comments

Comments
 (0)