aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-08-07 17:47:57 -0700
committerGitHub <noreply@github.com>2018-08-07 17:47:57 -0700
commit0483feb6e09895f3c59d4597543ed63d6f05de59 (patch)
tree0cae3868a6841dfade4d31eb04493d8262f336f8
parentf504d95d461319ad9fc11e0925569b84a4c65d7d (diff)
parent5ddc6874e46ce54ffba6daaf0af8d5bd88e38fd0 (diff)
downloadprotobuf-0483feb6e09895f3c59d4597543ed63d6f05de59.tar.gz
protobuf-0483feb6e09895f3c59d4597543ed63d6f05de59.tar.bz2
protobuf-0483feb6e09895f3c59d4597543ed63d6f05de59.zip
Merge pull request #5013 from prSquirrel/fix-typo-field-mask-tree
Fix typo in FieldMaskTree.java warning
-rw-r--r--java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java b/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
index 4a13fb1d..429579fc 100644
--- a/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
+++ b/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
@@ -240,7 +240,7 @@ final class FieldMaskTree {
"Field \""
+ field.getFullName()
+ "\" is not a "
- + "singluar message field and cannot have sub-fields.");
+ + "singular message field and cannot have sub-fields.");
continue;
}
if (!source.hasField(field) && !destination.hasField(field)) {