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 "Fix typo and add more descriptive error"
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
impl
/
osgi
/
NetconfImplActivator.java
diff --git
a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
index abebacf974d0527b72d6479fb2e83796e18aedd4..95f7353600fcfb67a5626a496d76642613c4bb5a 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
+++ b/
opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivator.java
@@
-48,8
+48,9
@@
public class NetconfImplActivator implements BundleActivator {
SessionIdProvider idProvider = new SessionIdProvider();
timer = new HashedWheelTimer();
SessionIdProvider idProvider = new SessionIdProvider();
timer = new HashedWheelTimer();
+ long connectionTimeoutMillis = NetconfConfigUtil.extractTimeoutMillis(context);
NetconfServerSessionNegotiatorFactory serverNegotiatorFactory = new NetconfServerSessionNegotiatorFactory(
NetconfServerSessionNegotiatorFactory serverNegotiatorFactory = new NetconfServerSessionNegotiatorFactory(
- timer, factoriesListener, idProvider);
+ timer, factoriesListener, idProvider
, connectionTimeoutMillis
);
commitNot = new DefaultCommitNotificationProducer(ManagementFactory.getPlatformMBeanServer());
commitNot = new DefaultCommitNotificationProducer(ManagementFactory.getPlatformMBeanServer());