rebase

src/idl_gen_general.cpp

@@ -252,7 +252,9 @@ static Type DestinationType(const LanguageParameters &lang, const Type &type,
                             bool vectorelem) {
   if (lang.language != GeneratorOptions::kJava) return type;
   switch (type.base_type) {
-    case BASE_TYPE_UCHAR:  return Type(BASE_TYPE_INT); //intentionally returns int to avoid unnecessary casting in Java
+    // We use int for both uchar/ushort, since that generally means less casting
+    // than using short for uchar.
+    case BASE_TYPE_UCHAR:  return Type(BASE_TYPE_INT);
     case BASE_TYPE_USHORT: return Type(BASE_TYPE_INT);
     case BASE_TYPE_UINT:   return Type(BASE_TYPE_LONG);
     case BASE_TYPE_VECTOR: