Bug 4957 RoleContext updated with initialization

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / util / DeviceInitializationUtils.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtils.java
index 784ea0a4603f1a376da842ad20a4bb96108931a7..09310a4e397f6dddf630c1626f7182fac10c65f0 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtils.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtils.java
@@ -98,7 +98,7 @@ public class DeviceInitializationUtils {
      * @param switchFeaturesMandatory
      * @return future - recommended to have blocking call for this future
      */
-    public static Future<Void> initializeNodeInformation(final DeviceContext deviceContext, final boolean switchFeaturesMandatory) {
+    public static ListenableFuture<Void> initializeNodeInformation(final DeviceContext deviceContext, final boolean switchFeaturesMandatory) {
         Preconditions.checkArgument(deviceContext != null);
         final DeviceState deviceState = Preconditions.checkNotNull(deviceContext.getDeviceState());
         final ConnectionContext connectionContext = Preconditions.checkNotNull(deviceContext.getPrimaryConnectionContext());
@@ -165,7 +165,7 @@ public class DeviceInitializationUtils {
                 LOG.trace("Device capabilities gathering future failed.");
                 LOG.trace("more info in exploration failure..", t);
                 LOG.debug("All init data for node {} was not submited correctly - connection has to go down.", deviceState.getNodeId());
-                returnFuture.cancel(true);
+                returnFuture.setException(t);
             }
         });
         return returnFuture;