third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 77 matching lines @@
     }
 
     for (String getter : getters) {
       String suffix = getter.replaceFirst("get", "");
       if (suffix.endsWith(LIST_SUFFIX) && !suffix.endsWith(BUILDER_LIST_SUFFIX)) {
         String camelCase = suffix.substring(0, 1).toLowerCase()
             + suffix.substring(1, suffix.length() - LIST_SUFFIX.length());
         // Try to reflectively get the value and toString() the field as if it were repeated. This
         // only works if the method names have not be proguarded out or renamed.
         Method listMethod = nameToNoArgMethod.get("get" + suffix);
-        if (listMethod != null) {
+        if (listMethod != null && listMethod.getReturnType().equals(List.class)) {
           printField(
               buffer,
               indent,
               camelCaseToSnakeCase(camelCase),
               GeneratedMessageLite.invokeOrDie(listMethod, messageLite));
           continue;
         }
       }
 
       Method setter = nameToMethod.get("set" + suffix);
       if (setter == null) {
         continue;
       }
       if (suffix.endsWith(BYTES_SUFFIX)
           && nameToNoArgMethod.containsKey(
               "get" + suffix.substring(0, suffix.length() - "Bytes".length()))) {
         // Heuristic to skip bytes based accessors for string fields.
         continue;
       }
-      
+
       String camelCase = suffix.substring(0, 1).toLowerCase() + suffix.substring(1);
 
       // Try to reflectively get the value and toString() the field as if it were optional. This
       // only works if the method names have not be proguarded out or renamed.
       Method getMethod = nameToNoArgMethod.get("get" + suffix);
       Method hasMethod = nameToNoArgMethod.get("has" + suffix);
       // TODO(dweis): Fix proto3 semantics.
       if (getMethod != null) {
         Object value = GeneratedMessageLite.invokeOrDie(getMethod, messageLite);
         final boolean hasValue = hasMethod == null
@@ skipping 101 matching lines @@
     for (int i = 0; i < camelCase.length(); i++) {
       char ch = camelCase.charAt(i);
       if (Character.isUpperCase(ch)) {
         builder.append("_");
       }
       builder.append(Character.toLowerCase(ch));
     }
     return builder.toString();
   }
 }