Skip to content

Commit

Permalink
Switched to protobuf
Browse files Browse the repository at this point in the history
  • Loading branch information
jomof committed Dec 20, 2016
1 parent 06c5ee3 commit 3191f4d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/jomofisher/cmakeserver/JsonFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public String print(MessageOrBuilder message) throws InvalidProtocolBufferExcept
public static class TypeRegistry {
private static class EmptyTypeRegistryHolder {
private static final TypeRegistry EMPTY =
new TypeRegistry(Collections.emptyMap());
new TypeRegistry(Collections.<String, Descriptor>emptyMap());
}

public static TypeRegistry getEmptyTypeRegistry() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ private static Method getCachedMethod(Class<?> clazz, String methodName,
Method method = mapOfMethods.get(clazz);
if (method == null) {
method = clazz.getMethod(methodName, methodParamTypes);
mapOfMethods.putIfAbsent(clazz, method);
mapOfMethods.put(clazz, method);
// NB: it doesn't matter which method we return in the event of a race.
}
return method;
Expand Down

0 comments on commit 3191f4d

Please sign in to comment.