From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 30 Sep 2014 17:17:39 +0000 (+0000)
Subject: Merge changes I95a821aa,I4a90a3b6,I9f77a16a
X-Git-Tag: release/helium~2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=726c13c574c0154d21434692ba22a1d2310ecec8;hp=9b8c69b490e82fafdd996af5ea06c8f5113a0666

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 cbe9235245..2ecd267b9f 100644
--- 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);