organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Rename readData() to readPrimitiveField() in JavaNano.

Browse source
This commit is contained in:
Jisi Liu 2015-02-05 17:14:02 -08:00
parent 7f3693184a
commit cd99c12df2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
javanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
View file

@ -640,7 +640,7 @@ public final class CodedInputByteBufferNano {
}
// Read a primitive type.
Object readData(int type) throws IOException {
Object readPrimitiveField(int type) throws IOException {
switch (type) {
case InternalNano.TYPE_DOUBLE:
return readDouble();

2
javanano/src/main/java/com/google/protobuf/nano/Extension.java
View file

@ -338,7 +338,7 @@ public class Extension<M extends ExtendableMessageNano<M>, T> {
@Override
protected Object readData(CodedInputByteBufferNano input) {
try {
return input.readData(type);
return input.readPrimitiveField(type);
} catch (IOException e) {
throw new IllegalArgumentException("Error reading extension field", e);
}

4
javanano/src/main/java/com/google/protobuf/nano/InternalNano.java
View file

@ -421,12 +421,12 @@ public final class InternalNano {
break;
}
if (tag == keyTag) {
key = (K) input.readData(keyType);
key = (K) input.readPrimitiveField(keyType);
} else if (tag == valueTag) {
if (valueType == TYPE_MESSAGE) {
input.readMessage((MessageNano) value);
} else {
value = (V) input.readData(valueType);
value = (V) input.readPrimitiveField(valueType);
}
} else {
if (!input.skipField(tag)) {