Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
re-activate FindBugs
[openflowplugin.git]
/
openflowplugin-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
openflowplugin
/
impl
/
connection
/
listener
/
ConnectionReadyListenerImpl.java
diff --git
a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/ConnectionReadyListenerImpl.java
b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/ConnectionReadyListenerImpl.java
index b74e59944761baa4507c646bc8faf3d31ed5ad80..21769465227e0caa49a333ab525d0675a28c8cad 100644
(file)
--- a/
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/ConnectionReadyListenerImpl.java
+++ b/
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/ConnectionReadyListenerImpl.java
@@
-16,28
+16,30
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
import org.slf4j.LoggerFactory;
/**
- *
oneshot listener - once connection is ready, initiate handshake (if not already started by device)
+ *
Oneshot listener - once connection is ready, initiate handshake (if not already started by device).
*/
public class ConnectionReadyListenerImpl implements ConnectionReadyListener {
private static final Logger LOG = LoggerFactory.getLogger(ConnectionReadyListenerImpl.class);
*/
public class ConnectionReadyListenerImpl implements ConnectionReadyListener {
private static final Logger LOG = LoggerFactory.getLogger(ConnectionReadyListenerImpl.class);
- private ConnectionContext connectionContext;
- private HandshakeContext handshakeContext;
+ private
final
ConnectionContext connectionContext;
+ private
final
HandshakeContext handshakeContext;
/**
/**
- * @param connectionContext
- * @param handshakeContext
+ * Constructor.
+ *
+ * @param connectionContext - connection context
+ * @param handshakeContext - handshake context
*/
*/
- public ConnectionReadyListenerImpl(ConnectionContext connectionContext,
- HandshakeContext handshakeContext) {
- this.connectionContext = connectionContext;
- this.handshakeContext = handshakeContext;
+ public ConnectionReadyListenerImpl(ConnectionContext connectionContext, HandshakeContext handshakeContext) {
+ this.connectionContext = connectionContext;
+ this.handshakeContext = handshakeContext;
}
@Override
}
@Override
+ @SuppressWarnings("checkstyle:IllegalCatch")
public void onConnectionReady() {
public void onConnectionReady() {
- if(LOG.isDebugEnabled()) {
+ if
(LOG.isDebugEnabled()) {
LOG.debug("device is connected and ready-to-use (pipeline prepared): {}",
connectionContext.getConnectionAdapter().getRemoteAddress());
}
LOG.debug("device is connected and ready-to-use (pipeline prepared): {}",
connectionContext.getConnectionAdapter().getRemoteAddress());
}
@@
-51,21
+53,15
@@
public class ConnectionReadyListenerImpl implements ConnectionReadyListener {
final Future<?> handshakeResult = handshakeContext.getHandshakePool().submit(handshakeStepWrapper);
try {
final Future<?> handshakeResult = handshakeContext.getHandshakePool().submit(handshakeStepWrapper);
try {
- // as we run not in netty thread, need to remain in sync lock until initial handshake step processed
+ // As we run not in netty thread,
+ // need to remain in sync lock until initial handshake step processed.
handshakeResult.get();
} catch (Exception e) {
handshakeResult.get();
} catch (Exception e) {
- LOG.error("failed to process onConnectionReady event on device {}
, reason {}
",
+ LOG.error("failed to process onConnectionReady event on device {}",
connectionContext.getConnectionAdapter().getRemoteAddress(),
e);
connectionContext.closeConnection(false);
connectionContext.getConnectionAdapter().getRemoteAddress(),
e);
connectionContext.closeConnection(false);
- try {
- handshakeContext.close();
- } catch (Exception e1) {
- LOG.error("failed to close handshake context for device {}, reason {}",
- connectionContext.getConnectionAdapter().getRemoteAddress(),
- e1
- );
- }
+ handshakeContext.close();
}
} else {
LOG.debug("already touched by hello message from device {} after second check",
}
} else {
LOG.debug("already touched by hello message from device {} after second check",