| Index: third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc
|
| index c54347677b394a9d3b0eed526394b403198a922a..3c7bc5c4674fbfc6dfb3a66594886cb8b3b8b797 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc
|
| @@ -77,7 +77,7 @@ ImmutableFieldGenerator* MakeImmutableGenerator(
|
| return new ImmutableMapFieldGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new RepeatedImmutableLazyMessageFieldGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| @@ -99,7 +99,7 @@ ImmutableFieldGenerator* MakeImmutableGenerator(
|
| if (field->containing_oneof()) {
|
| switch (GetJavaType(field)) {
|
| case JAVATYPE_MESSAGE:
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new ImmutableLazyMessageOneofFieldGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| @@ -119,7 +119,7 @@ ImmutableFieldGenerator* MakeImmutableGenerator(
|
| } else {
|
| switch (GetJavaType(field)) {
|
| case JAVATYPE_MESSAGE:
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new ImmutableLazyMessageFieldGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| @@ -150,7 +150,7 @@ ImmutableFieldLiteGenerator* MakeImmutableLiteGenerator(
|
| return new ImmutableMapFieldLiteGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new RepeatedImmutableLazyMessageFieldLiteGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| @@ -172,7 +172,7 @@ ImmutableFieldLiteGenerator* MakeImmutableLiteGenerator(
|
| if (field->containing_oneof()) {
|
| switch (GetJavaType(field)) {
|
| case JAVATYPE_MESSAGE:
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new ImmutableLazyMessageOneofFieldLiteGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
| @@ -192,7 +192,7 @@ ImmutableFieldLiteGenerator* MakeImmutableLiteGenerator(
|
| } else {
|
| switch (GetJavaType(field)) {
|
| case JAVATYPE_MESSAGE:
|
| - if (IsLazy(field)) {
|
| + if (IsLazy(field, context->EnforceLite())) {
|
| return new ImmutableLazyMessageFieldLiteGenerator(
|
| field, messageBitIndex, builderBitIndex, context);
|
| } else {
|
|
|