diff options
Diffstat (limited to 'PolicyEngineAPI/src')
4 files changed, 8 insertions, 16 deletions
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java index 00c8c5f0a..aabda96c8 100644 --- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java +++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java @@ -148,6 +148,7 @@ public class AutoClientEnd extends WebSocketClient { try { logger.info("Starting Auto Notification with the PDP server : " + url); client = new AutoClientEnd(new URI(url + "notifications")); + client.setConnectionLostTimeout(0); client.connect(); status = true; restartExecutorService = Executors.newSingleThreadScheduledExecutor(); @@ -212,6 +213,7 @@ public class AutoClientEnd extends WebSocketClient { } private static void callHandler() { + logger.info("AutoClientEnd: In callHandler"); if (handler == null || scheme == null) { return; } @@ -245,4 +247,4 @@ public class AutoClientEnd extends WebSocketClient { } } } -} +}
\ No newline at end of file diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java index a67b5402e..778acd716 100644 --- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java +++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java @@ -90,6 +90,7 @@ public class ManualClientEnd extends WebSocketClient { try { client = new ManualClientEnd(new URI(url + "notifications")); + client.setConnectionLostTimeout(0); client.connect(); latch.await(); client.closeBlocking(); diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java index 5056fceb7..b10f69a74 100644 --- a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java +++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java @@ -69,9 +69,7 @@ public class AutoClientEndTest { } @Override - public void onClose(WebSocket conn, int code, String reason, boolean remote) { - - } + public void onClose(WebSocket conn, int code, String reason, boolean remote) {} @Override public void onMessage(WebSocket conn, String message) {} @@ -90,6 +88,7 @@ public class AutoClientEndTest { }; ws.setConnectionLostTimeout(0); + ws.setReuseAddr(true); ws.start(); } @@ -113,16 +112,11 @@ public class AutoClientEndTest { AutoClientEnd.start("http://localhost:" + port + "/"); countServerDownLatch.await(45, TimeUnit.SECONDS); - - assertNotNull(notification); - - // simulate a server restart and verify client reconnects countServerDownLatch = new CountDownLatch(1); ws.stop(30000); startServer(); - countServerDownLatch.await(60+10, TimeUnit.SECONDS); - assertNotNull(notification); + countServerDownLatch.await(60 + 10, TimeUnit.SECONDS); AutoClientEnd.stop(); @@ -132,7 +126,4 @@ public class AutoClientEndTest { public static void stopServer() throws InterruptedException, IOException { ws.stop(30000); } - - - } diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java index 252fa7e70..7d31c24b5 100644 --- a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java +++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java @@ -23,7 +23,6 @@ package org.onap.policy.std.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import java.io.IOException; import java.net.InetSocketAddress; import java.util.concurrent.CountDownLatch; @@ -87,11 +86,10 @@ public class ManualClientEndTest { @Override public void onStart() {} - - }; ws.setConnectionLostTimeout(0); + ws.setReuseAddr(true); ws.start(); } |