Merge changes I95a821aa,I4a90a3b6,I9f77a16a

* changes:
  BUG-2078  Stats not being collected from all nodes, dangling nodes left in oper data store after mininet disconnects BUG-2049  DataStore failure in StatisticsManager
  Bug 2106: Refactored FlowCapableInventoryProvider to properly work with failures.
  Bug 2103: Revert "Bug 2101: Do not block processing on transaction submit."

diff --git a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
index cbe923524516077497f806fdad9b74c4d84e9927..2ecd267b9f47b195b406b4ed0d8c8fd3b068937a 100644 (file)
--- a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
+++ b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
@@ -46,7 +46,7 @@ public abstract class AbstractSessionNegotiator<M, S extends AbstractProtocolSes
         promise.setSuccess(session);
     }
 
-    protected final void negotiationFailed(final Throwable cause) {
+    protected void negotiationFailed(final Throwable cause) {
         LOG.debug("Negotiation on channel {} failed", channel, cause);
         channel.close();
         promise.setFailure(cause);