aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2016-11-16 10:07:50 -0800
committerGitHub <noreply@github.com>2016-11-16 10:07:50 -0800
commitfc27ead10719f768eb990accac434f48efe10d16 (patch)
tree2856c70c75c02af5062feafdb0e465a0672c8de2
parenta3dfbe6e52dd86098044f359bfe419216944ba17 (diff)
parentabeff7b4fd6a909bd32723d90dc0e0535c84bd0a (diff)
downloadprotobuf-fc27ead10719f768eb990accac434f48efe10d16.tar.gz
protobuf-fc27ead10719f768eb990accac434f48efe10d16.tar.bz2
protobuf-fc27ead10719f768eb990accac434f48efe10d16.zip
Merge pull request #2362 from wujingchao/patch-1
Class is final but declares protected field
-rw-r--r--javanano/src/main/java/com/google/protobuf/nano/InternalNano.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java
index f1263df5..278368a0 100644
--- a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java
+++ b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java
@@ -67,8 +67,8 @@ public final class InternalNano {
public static final int TYPE_SINT32 = 17;
public static final int TYPE_SINT64 = 18;
- protected static final Charset UTF_8 = Charset.forName("UTF-8");
- protected static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+ static final Charset UTF_8 = Charset.forName("UTF-8");
+ static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
private InternalNano() {}