From 06372cb143e135acfc91d151a69a2e1dc1be0a53 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 6 Nov 2015 20:46:29 -0800 Subject: [PATCH] JNI: Don't call HALInitialize() within an assert(). If built without asserts enabled (e.g. -DNDEBUG), HALInitialize won't get called. Instead call outside the assert and then do the assert. Change-Id: I51546b9f9fc9a74f8a3a732c4b754257d9697e46 --- wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp b/wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp index 9f63a5f396..dc734b766f 100644 --- a/wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp +++ b/wpilibj/wpilibJavaJNI/lib/FRCNetworkCommunicationsLibrary.cpp @@ -256,7 +256,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_communication_FRCNetworkCommun JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_communication_FRCNetworkCommunicationsLibrary_FRCNetworkCommunicationReserve (JNIEnv *, jclass) { - assert(1 == HALInitialize(0)); + int rv = HALInitialize(0); + assert(1 == rv); } /*