X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api%2Fjava%2Fjvpp-core%2Fio%2Ffd%2Fvpp%2Fjvpp%2Fcore%2Ftest%2FCallbackJVppFacadeNotificationTest.java;h=d84cb034ef1d43804ba4779dfbde48740f0392aa;hb=9c2964ce01fa05c715499206cf3d0f610c5c334d;hp=f8845d622d65bd7a76648cce2f297074c2d91f3d;hpb=1ce0879900031d530333799dbfa564e66b8dcf80;p=vpp.git

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 f8845d622d6..d84cb034ef1 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);
     }