Misc fix for some error seen during IT and javadoc

- Silent StaticRoutingImplementation when thread is interrupted, it can
happen.
- During IT logging bridge complain for a null exception because
unhandled.
- Fix some deprecation warning not really needed and some spellings in
javadocs

Change-Id: Id6daa0560943a52b25fbdd4b8a24624e0254353e
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java
index 2f74ec39e4e0b559a2820ed0127c3fc750ba637d..fdf08bcbacdae07bc04fa362958864b1741fc5a4 100644 (file)
--- a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java
+++ b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java
@@ -10,7 +10,7 @@
 /**
  * @file   IClusterContainerServices.java
  *
- * @brief  : Set of services and application will expect from the
+ * @brief  : Set of services an application will expect from the
  * clustering services provider. This interface is per-container and so
  * the container parameter is implicitely known
  *
@@ -21,9 +21,9 @@
 package org.opendaylight.controller.clustering.services;
 
 /**
- * Set of services and application will expect from the
- * clustering services provider. This interface is per-container and so
- * the container parameter is implicitly known
+ * Set of services an application will expect from the clustering services
+ * provider. This interface is per-container and so the container parameter is
+ * implicitly known
  *
  */
 public interface IClusterContainerServices extends IClusterServicesCommon {

diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java
index 61ad41529d286ae61e4360344f548e9a4461c3f4..58d8c0051b45e2efba4fd9fc587f0a28bc49a1be 100644 (file)
--- a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java
+++ b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java
@@ -10,7 +10,7 @@
 /**
  * @file   IClusterGlobalServices.java
  *
- * @brief  : Set of services and application will expect from the
+ * @brief  : Set of services an application will expect from the
  * clustering services provider. This interface is supposed to have
  * Global scope
  *
@@ -21,9 +21,8 @@
 package org.opendaylight.controller.clustering.services;
 
 /**
- * Set of services and application will expect from the
- * clustering services provider. This interface is supposed to have
- * Global scope
+ * Set of services an application will expect from the clustering services
+ * provider. This interface is supposed to have Global scope
  *
  */
 public interface IClusterGlobalServices extends IClusterServicesCommon {

diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java
index 68960baa07a0d157b1c101fbdb6832208e54376c..a27b00eb1feb7d433cc8c46bed7ae84aa1baabc5 100644 (file)
--- a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java
+++ b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java
@@ -10,7 +10,7 @@
 /**
  * @file   IClusterServices.java
  *
- * @brief  : Set of services and application will expect from the
+ * @brief  : Set of services an application will expect from the
  * clustering services provider
  *
  * Contract between the applications and the clustering service
@@ -33,7 +33,7 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 
 /**
- * Set of services and application will expect from the
+ * Set of services an application will expect from the
  * clustering services provider
  *
  */

diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java
index e292f73e540ee63aa07b7b28f9904c7d993ca28f..6850c64a0ed15774c3808773241659da7b75d7aa 100644 (file)
--- a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java
+++ b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java
@@ -10,7 +10,7 @@
 /**
  * @file   IClusterServicesCommon.java
  *
- * @brief  : Set of services and application will expect from the
+ * @brief  : Set of services an application will expect from the
  * clustering services provider. This interface is going to be the
  * base for per-container and Global services and so the container
  * parameter is omitted but who uses knows about it
@@ -35,11 +35,12 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 
 /**
- * @deprecated for internal use
- * Set of services and application will expect from the
- * clustering services provider. This interface is going to be the
- * base for per-container and Global services and so the container
- * parameter is omitted but who uses knows about it
+ * This WILL NOT BE USED DIRECTLY, but VIA SUBCLASS
+ *
+ * Set of services and application will expect from the clustering services
+ * provider. This interface is going to be the base for per-container and Global
+ * services and so the container parameter is omitted but who uses knows about
+ * it
  *
  */
 public interface IClusterServicesCommon {

diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java
index eac854c10674f796fae64ec174aaef07aad4aed5..1b2128957e9352ffd93a0a0991abf91ec3a354ea 100644 (file)
--- a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java
+++ b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java
@@ -232,6 +232,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify,
                     if (future != null) {
                         try {
                             host = future.get();
+                        } catch (InterruptedException ioe) {
+                            log.trace("Thread interrupted {}", ioe);
                         } catch (Exception e) {
                             log.error("", e);
                         }

diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java
index 7061954e80e199b2a52c49eeace78ad27b9d4518..283e756cd1b9edab8170158fb4152a6e20d365cc 100644 (file)
--- a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java
+++ b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java
@@ -102,12 +102,15 @@ public class Activator implements BundleActivator {
                 this.bundlecontext = ctxt;
         }
 
+        @Override
         public void run () {
             try {
                 this.bundlecontext.getBundle(0).stop();
                 log.debug("shutdown handler thread called");
             } catch (BundleException e) {
                 log.debug("Bundle couldn't be stopped");
+            } catch (Exception e) {
+                log.debug("Unhandled exception");
             }
         }
     }