aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-01-23 16:06:13 -0800
committerGitHub <noreply@github.com>2018-01-23 16:06:13 -0800
commit80e016e83898b2bd4f197f1d57c7e1453828e846 (patch)
tree2e0920dc69ff9c3b52cb7e57a6ed7db1d2362ccd /java
parenta721bf6d294915b412e4ba6b5d92a9b84c6bfef9 (diff)
parent1c3b20b1221cc90a669721102a521e2896933dbe (diff)
downloadprotobuf-80e016e83898b2bd4f197f1d57c7e1453828e846.tar.gz
protobuf-80e016e83898b2bd4f197f1d57c7e1453828e846.tar.bz2
protobuf-80e016e83898b2bd4f197f1d57c7e1453828e846.zip
Merge pull request #4205 from xuwei-k/patch-2
fix typo in FieldMaskTree.java comment
Diffstat (limited to 'java')
-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 e017b987..4a13fb1d 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
@@ -245,7 +245,7 @@ final class FieldMaskTree {
}
if (!source.hasField(field) && !destination.hasField(field)) {
// If the message field is not present in both source and destination, skip recursing
- // so we don't create unneccessary empty messages.
+ // so we don't create unnecessary empty messages.
continue;
}
String childPath = path.isEmpty() ? entry.getKey() : path + "." + entry.getKey();