commit c7fc97ad85993956a5e76c2ea69dbd90b34360ac
author Marek Gradzki <mgradzki@cisco.com> Mon Oct 16 12:33:12 2017 +0200
committer Dave Wallace <dwallacelf@gmail.com> Mon Oct 16 14:18:09 2017 +0000
tree 34dcf0074b5c6b1f95e742af767f28bc9986f507
parent f90813d64c4d1aee3a51609e85e632b1f9a37536

jvpp: stop plugin intialization on first mismatch

Java bindings use get_message_id from jvpp-common
to detect if messages known at compile time
are avaliable at runtime.

In case of missing entry, Java exception is propagated
via JNI using (*env)->ThrowNew.

But this function does not end code execution so,
in order to prevent unexpected behaviour
(e.g. calling vl_msg_api_set_handlers with id == 0),
get_message_id caller should do it manually.

Change-Id: I2edb5013fd3658dcdd77a867b5cdf62e559ee071
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

src/vpp-api/java/jvpp-nat/jvpp_nat.c

diff --git a/src/vpp-api/java/jvpp-nat/jvpp_nat.c b/src/vpp-api/java/jvpp-nat/jvpp_nat.c
index 85217f0..56c74d2 100644
--- a/src/vpp-api/java/jvpp-nat/jvpp_nat.c
+++ b/src/vpp-api/java/jvpp-nat/jvpp_nat.c
@@ -54,7 +54,7 @@
 
   // verify API has not changed since jar generation
   #define _(N)             \
-      get_message_id(env, #N);
+      if (get_message_id(env, #N) == 0) return;
       foreach_supported_api_message;
   #undef _