Bug 4098 - ofoverlay-renderer failure in jdk8

[groupbasedpolicy.git] / groupbasedpolicy / src / main / java / org / opendaylight / groupbasedpolicy / endpoint / EndpointRpcRegistry.java

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/endpoint/EndpointRpcRegistry.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/endpoint/EndpointRpcRegistry.java
index 9b7e77e986de88b74259b9dd99af572be61bf310..ce6acd51e291c218d78a204bfc9c1642f8ba0fd4 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/endpoint/EndpointRpcRegistry.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/endpoint/EndpointRpcRegistry.java
@@ -118,7 +118,7 @@ public class EndpointRpcRegistry implements EndpointService {
 
     /**
      *
-     * @param regImp
+     * @param regImp the endpoint augmentation
      * @throws Exception
      */
     public static void unregister(EpRendererAugmentation regImp)
@@ -167,9 +167,9 @@ public class EndpointRpcRegistry implements EndpointService {
     /**
      * Constructor
      *
-     * @param dataProvider
-     * @param rpcRegistry
-     * @param executor
+     * @param dataProvider the {@link DataBroker}
+     * @param rpcRegistry  the {@link RpcProviderRegistry}
+     * @param executor     the {@link ScheduledExecutorService}
      */
     private EndpointRpcRegistry(DataBroker dataProvider,
             RpcProviderRegistry rpcRegistry,
@@ -229,9 +229,9 @@ public class EndpointRpcRegistry implements EndpointService {
                     Class<? extends Augmentation<Endpoint>> augmentationType = (Class<? extends Augmentation<Endpoint>>) getAugmentationContextType(augmentation);
                     eb.addAugmentation(augmentationType, augmentation);
                 }
-            } catch (Throwable t) {
+            } catch (Exception e) {
                 LOG.warn("Endpoint Augmentation error while processing "
-                        + entry.getKey() + ". Reason: ", t);
+                        + entry.getKey() + ". Reason: ", e);
             }
         }
         return eb;
@@ -257,9 +257,9 @@ public class EndpointRpcRegistry implements EndpointService {
                     Class<? extends Augmentation<EndpointL3>> augmentationType = (Class<? extends Augmentation<EndpointL3>>) getAugmentationContextType(augmentation);
                     eb.addAugmentation(augmentationType, augmentation);
                 }
-            } catch (Throwable t) {
+            } catch (Exception e) {
                 LOG.warn("L3 endpoint Augmentation error while processing "
-                        + entry.getKey() + ". Reason: ", t);
+                        + entry.getKey() + ". Reason: ", e);
             }
         }
         return eb;
@@ -279,9 +279,9 @@ public class EndpointRpcRegistry implements EndpointService {
                 .entrySet()) {
             try {
                 entry.getValue().buildL3PrefixEndpointAugmentation(eb, input);
-            } catch (Throwable t) {
+            } catch (Exception e) {
                 LOG.warn("L3 endpoint Augmentation error while processing "
-                        + entry.getKey() + ". Reason: ", t);
+                        + entry.getKey() + ". Reason: ", e);
             }
         }
         return eb;
@@ -308,7 +308,7 @@ public class EndpointRpcRegistry implements EndpointService {
                     InstanceIdentifier.builder(Endpoints.class)
                             .child(Endpoint.class, key)
                             .build();
-            t.put(LogicalDatastoreType.OPERATIONAL, iid, ep);
+            t.put(LogicalDatastoreType.OPERATIONAL, iid, ep, true);
         }
         if (input.getL3Address() != null) {
             for (L3Address l3addr : input.getL3Address()) {
@@ -323,7 +323,7 @@ public class EndpointRpcRegistry implements EndpointService {
                         InstanceIdentifier.builder(Endpoints.class)
                                 .child(EndpointL3.class, key3)
                                 .build();
-                t.put(LogicalDatastoreType.OPERATIONAL, iid_l3, ep3);
+                t.put(LogicalDatastoreType.OPERATIONAL, iid_l3, ep3, true);
             }
         }
         ListenableFuture<Void> r = t.submit();