Bug 7764 - Do no throw warning on explicit task cancellation

Change-Id: I9477823ffd1b4e9b28484ae8cde166a2d03f5a9f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit d813c7f656b4dd6f460b66a2fa303a448f6a4e07)

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
index 8f49fd7fe44b8e67fdc9023f91fe682cab97d5b1..7127bb5eda639aa46f17513956ff77511d0639a1 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
@@ -18,6 +18,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Future;
@@ -164,8 +165,10 @@ public class StatisticsManagerImpl implements StatisticsManager, StatisticsManag
                             deviceInfo.getLOGValue(),throwable);
                     stopScheduling(deviceInfo);
                 } else {
-                    LOG.warn("Unexpected error occurred during statistics collection for node {}, rescheduling " +
-                            "statistics collections", deviceInfo.getLOGValue(),throwable);
+                    if (!(throwable instanceof CancellationException)) {
+                        LOG.warn("Unexpected error occurred during statistics collection for node {}, rescheduling " +
+                                "statistics collections", deviceInfo.getLOGValue(),throwable);
+                    }
                     scheduleNextPolling(deviceState, deviceInfo, statisticsContext, timeCounter);
                 }
             }