Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix improper cleanup of operational data in sal-netconf-connector's disconnect
[controller.git]
/
opendaylight
/
commons
/
protocol-framework
/
src
/
main
/
java
/
org
/
opendaylight
/
protocol
/
framework
/
ReconnectPromise.java
diff --git
a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/ReconnectPromise.java
b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/ReconnectPromise.java
index ea87afa48dedddfe20ef5430aa60d25ecc594c1a..b2ab27a82671cdc0c2380ac8f1084e540ee61691 100644
(file)
--- a/
opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/ReconnectPromise.java
+++ b/
opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/ReconnectPromise.java
@@
-80,7
+80,7
@@
final class ReconnectPromise<S extends ProtocolSession<?>, L extends SessionList
/**
* Channel handler that responds to channelInactive event and reconnects the session.
/**
* Channel handler that responds to channelInactive event and reconnects the session.
- * Only if the
initial connection was successfully established and
promise was not canceled.
+ * Only if the promise was not canceled.
*/
private static final class ClosedChannelHandler extends ChannelInboundHandlerAdapter {
private final ReconnectPromise<?, ?> promise;
*/
private static final class ClosedChannelHandler extends ChannelInboundHandlerAdapter {
private final ReconnectPromise<?, ?> promise;
@@
-98,10
+98,8
@@
final class ReconnectPromise<S extends ProtocolSession<?>, L extends SessionList
return;
}
return;
}
- // Check if initial connection was fully finished. If the session was dropped during negotiation, reconnect will not happen.
- // Session can be dropped during negotiation on purpose by the client side and would make no sense to initiate reconnect
if (promise.isInitialConnectFinished() == false) {
if (promise.isInitialConnectFinished() == false) {
-
return
;
+
LOG.debug("Connection to {} was dropped during negotiation, reattempting", promise.address)
;
}
LOG.debug("Reconnecting after connection to {} was dropped", promise.address);
}
LOG.debug("Reconnecting after connection to {} was dropped", promise.address);