Java: Fix getValue().

This commit is contained in:
Peter Johnson
2015-12-06 08:22:12 -08:00
parent c2642f39ed
commit 3cd20d3ff2

View File

@@ -640,7 +640,7 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTables
(JNIEnv *env, jclass, jstring key)
{
auto val = nt::GetEntryValue(JavaStringRef(env, key));
if (!val || !val->IsBoolean()) {
if (!val) {
ThrowTableKeyNotDefined(env, key);
return nullptr;
}
@@ -768,7 +768,7 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTables
(JNIEnv *env, jclass, jstring key, jobject defaultValue)
{
auto val = nt::GetEntryValue(JavaStringRef(env, key));
if (!val || !val->IsBoolean()) return defaultValue;
if (!val) return defaultValue;
return ToJavaObject(env, *val);
}