Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-509: Move ModificationApplyOperation"
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
implementation
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
sal
/
connector
/
remoterpc
/
utils
/
MessagingUtil.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/utils/MessagingUtil.java
b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/utils/MessagingUtil.java
index a68ee574f339526fa2c7a3f5b06e23a78ea13700..883aa52f3f278d5bd725d9c99c1406f795caf04f 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/utils/MessagingUtil.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/utils/MessagingUtil.java
@@
-7,12
+7,6
@@
package org.opendaylight.controller.sal.connector.remoterpc.utils;
package org.opendaylight.controller.sal.connector.remoterpc.utils;
-import junit.framework.Assert;
-import org.opendaylight.controller.sal.connector.remoterpc.dto.Message;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.zeromq.ZMQ;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@
-21,6
+15,13
@@
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
+import junit.framework.Assert;
+
+import org.opendaylight.controller.sal.connector.remoterpc.dto.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.zeromq.ZMQ;
+
public class MessagingUtil {
private static final Logger _logger = LoggerFactory.getLogger(MessagingUtil.class);
public class MessagingUtil {
private static final Logger _logger = LoggerFactory.getLogger(MessagingUtil.class);
@@
-160,7
+161,7
@@
public class MessagingUtil {
if (context == null) return;
ExecutorService exec = Executors.newSingleThreadExecutor();
if (context == null) return;
ExecutorService exec = Executors.newSingleThreadExecutor();
- FutureTask
zmqTermination = new FutureTask
(new Runnable() {
+ FutureTask
<?> zmqTermination = new FutureTask<Void>
(new Runnable() {
@Override
public void run() {
@Override
public void run() {