commit 6a51cb9c4d68cf335437abd57995e5958c6c7f89
author Ray Milkey <ray@opennetworking.org> Tue Mar 06 09:03:03 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Wed Mar 07 21:52:46 2018 +0000
tree 2d7df0c7f5794d5d36c11fb09c27493d0ce8c690
parent c9e92242dd4bcd2a0a23920c36c1307eb3080e33

Remove calls to deprecated Throwables.propagate() method

Change-Id: Id48a8f1d4fb02560cfb77108f554556a3cad9b16

core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java

diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
index 7fdc2df..b79effc 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
@@ -126,7 +126,7 @@
         } catch (TimeoutException e) {
             throw new ConsistentMapException.Timeout(name());
         } catch (ExecutionException e) {
-            Throwables.propagateIfPossible(e.getCause());
+            Throwables.throwIfUnchecked(e.getCause());
             throw new ConsistentMapException(e.getCause());
         }
     }

core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java

diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
index b22bb7d..1bc62b3 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
@@ -232,7 +232,7 @@
         } catch (TimeoutException e) {
             throw new ConsistentMapException.Timeout(name());
         } catch (ExecutionException e) {
-            Throwables.propagateIfPossible(e.getCause());
+            Throwables.throwIfUnchecked(e.getCause());
             throw new ConsistentMapException(e.getCause());
         }
     }

core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java

diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
index 1230e7a..8725c61 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
@@ -165,7 +165,7 @@
         } catch (TimeoutException e) {
             throw new ConsistentMapException.Timeout();
         } catch (ExecutionException e) {
-            Throwables.propagateIfPossible(e.getCause());
+            Throwables.throwIfUnchecked(e.getCause());
             throw new ConsistentMapException(e.getCause());
         }
     }

core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java

diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
index 30a8d67..c9dd5df 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
@@ -17,12 +17,11 @@
 package org.onosproject.store.primitives;
 
 import com.google.common.base.Throwables;
-
-import org.onosproject.store.service.ConsistentMapException;
 import org.onosproject.store.service.AsyncConsistentTreeMap;
+import org.onosproject.store.service.ConsistentMapException;
+import org.onosproject.store.service.ConsistentTreeMap;
 import org.onosproject.store.service.MapEventListener;
 import org.onosproject.store.service.Synchronous;
-import org.onosproject.store.service.ConsistentTreeMap;
 import org.onosproject.store.service.Versioned;
 
 import java.util.Collection;
@@ -63,7 +62,7 @@
             Thread.currentThread().interrupt();
             throw new ConsistentMapException.Interrupted();
         } catch (ExecutionException e) {
-            Throwables.propagateIfPossible(e.getCause());
+            Throwables.throwIfUnchecked(e.getCause());
             throw new ConsistentMapException(e.getCause());
         } catch (TimeoutException e) {
             throw new ConsistentMapException.Timeout();

core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java

diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
index 42142cc..ae2f640 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
@@ -119,7 +119,7 @@
         } catch (TimeoutException e) {
             throw new DocumentException.Timeout(name());
         } catch (ExecutionException e) {
-            Throwables.propagateIfPossible(e.getCause());
+            Throwables.throwIfUnchecked(e.getCause());
             throw new ConsistentMapException(e.getCause());
         }
     }