From 3b266b9617787c9857788fc27f432c2d5eee9db9 Mon Sep 17 00:00:00 2001 From: Giovanni Meo Date: Thu, 22 Aug 2013 22:56:45 +0200 Subject: [PATCH] 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 --- .../services/IClusterContainerServices.java | 8 ++++---- .../clustering/services/IClusterGlobalServices.java | 7 +++---- .../clustering/services/IClusterServices.java | 4 ++-- .../clustering/services/IClusterServicesCommon.java | 13 +++++++------ .../internal/StaticRoutingImplementation.java | 2 ++ .../logging/bridge/internal/Activator.java | 3 +++ 6 files changed, 21 insertions(+), 16 deletions(-) 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 2f74ec39e4..fdf08bcbac 100644 --- 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 61ad41529d..58d8c0051b 100644 --- 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 68960baa07..a27b00eb1f 100644 --- 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 e292f73e54..6850c64a0e 100644 --- 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 eac854c106..1b2128957e 100644 --- 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 7061954e80..283e756cd1 100644 --- 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"); } } } -- 2.36.6