Fix jvpp coverity issues #2

- synchronize AbstractFutureJvppInvoker.getRequests
- handle registry & jvpp close in API usage examples

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

1 files changed, 17 insertions, 19 deletions

diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
index f8845d62..d84cb034 100644
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
+++ b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
@@ -30,18 +30,17 @@ public class CallbackJVppFacadeNotificationTest {
     private static void testCallbackFacade() throws Exception {
         System.out.println("Testing CallbackJVppFacade for notifications");
 
-        final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
-        final JVppCore jvpp = new JVppCoreImpl();
+        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
+             final JVppCore jvpp = new JVppCoreImpl()) {
+            final CallbackJVppCoreFacade jvppCallbackFacade = new CallbackJVppCoreFacade(registry, jvpp);
+            System.out.println("Successfully connected to VPP");
 
-        CallbackJVppCoreFacade jvppCallbackFacade = new CallbackJVppCoreFacade(registry, jvpp);
-        System.out.println("Successfully connected to VPP");
-
-        final AutoCloseable notificationListenerReg =
+            final AutoCloseable notificationListenerReg =
                 jvppCallbackFacade.getNotificationRegistry().registerSwInterfaceSetFlagsNotificationCallback(
-                        NotificationUtils::printNotification
+                    NotificationUtils::printNotification
                 );
 
-        jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getEnableInterfaceNotificationsReq(),
+            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getEnableInterfaceNotificationsReq(),
                 new WantInterfaceEventsCallback() {
                     @Override
                     public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
@@ -51,16 +50,16 @@ public class CallbackJVppFacadeNotificationTest {
                     @Override
                     public void onError(final VppCallbackException ex) {
                         System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
-                                ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
+                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
                     }
                 });
 
-        System.out.println("Changing interface configuration");
-        NotificationUtils.getChangeInterfaceState().send(jvpp);
+            System.out.println("Changing interface configuration");
+            NotificationUtils.getChangeInterfaceState().send(jvpp);
 
-        Thread.sleep(1000);
+            Thread.sleep(1000);
 
-        jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getDisableInterfaceNotificationsReq(),
+            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getDisableInterfaceNotificationsReq(),
                 new WantInterfaceEventsCallback() {
                     @Override
                     public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
@@ -70,16 +69,15 @@ public class CallbackJVppFacadeNotificationTest {
                     @Override
                     public void onError(final VppCallbackException ex) {
                         System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
-                                ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
+                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
                     }
                 });
 
-        notificationListenerReg.close();
-
-        Thread.sleep(2000);
+            notificationListenerReg.close();
 
-        System.out.println("Disconnecting...");
-        registry.close();
+            Thread.sleep(2000);
+            System.out.println("Disconnecting...");
+        }
         Thread.sleep(1000);
     }