Repository: stratos Updated Branches: refs/heads/master 32ec7a8ed -> 51e503106
Replacing Throwable catch statements in load balancer, tenant activity, tenant activity ui components with Exception Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/51e50310 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/51e50310 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/51e50310 Branch: refs/heads/master Commit: 51e503106f86cab62894fa67c91ca132f899c97f Parents: 32ec7a8 Author: Imesh Gunaratne <[email protected]> Authored: Sun Jan 25 00:34:41 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Jan 25 00:34:41 2015 +0530 ---------------------------------------------------------------------- .../internal/StratosCommonServiceComponent.java | 4 ++-- .../internal/LoadBalancerServiceComponent.java | 14 +++++++------- .../ui/internal/TenantActivityUIServiceComponent.java | 2 +- .../internal/TenantActivityServiceComponent.java | 6 ++---- 4 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/51e50310/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/StratosCommonServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/StratosCommonServiceComponent.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/StratosCommonServiceComponent.java index 68adba0..3378a92 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/StratosCommonServiceComponent.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/StratosCommonServiceComponent.java @@ -109,9 +109,9 @@ public class StratosCommonServiceComponent { } if (log.isInfoEnabled()) { - log.info("Stratos common service bundle is activated"); + log.info("Stratos common service component is activated"); } - } catch (Throwable e) { + } catch (Exception e) { log.error("Error in activating stratos common service component", e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/51e50310/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java index 7e55163..d3ffbb7 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java @@ -26,18 +26,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.clustering.DistributedObjectProvider; import org.apache.stratos.common.threading.StratosThreadPool; -import org.apache.stratos.load.balancer.endpoint.EndpointDeployer; -import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerApplicationSignUpEventReceiver; -import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerDomainMappingEventReceiver; -import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTenantEventReceiver; -import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTopologyEventReceiver; -import org.apache.stratos.load.balancer.exception.TenantAwareLoadBalanceEndpointException; import org.apache.stratos.load.balancer.common.statistics.notifier.LoadBalancerStatisticsNotifier; import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; import org.apache.stratos.load.balancer.conf.configurator.CEPConfigurator; import org.apache.stratos.load.balancer.conf.configurator.SynapseConfigurator; import org.apache.stratos.load.balancer.conf.configurator.TopologyFilterConfigurator; import org.apache.stratos.load.balancer.context.LoadBalancerContext; +import org.apache.stratos.load.balancer.endpoint.EndpointDeployer; +import org.apache.stratos.load.balancer.exception.TenantAwareLoadBalanceEndpointException; +import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerApplicationSignUpEventReceiver; +import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerDomainMappingEventReceiver; +import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTenantEventReceiver; +import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTopologyEventReceiver; import org.apache.stratos.load.balancer.statistics.LoadBalancerStatisticsCollector; import org.apache.stratos.load.balancer.util.LoadBalancerConstants; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; @@ -413,7 +413,7 @@ public class LoadBalancerServiceComponent { if (log.isDebugEnabled()) { log.debug("Endpoint admin bundle is activated "); } - } catch (Throwable e) { + } catch (Exception e) { log.error("Failed to activate endpoint admin bundle ", e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/51e50310/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java index f1fca05..3d50383 100644 --- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java +++ b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java @@ -44,7 +44,7 @@ public class TenantActivityUIServiceComponent { if (log.isDebugEnabled()) { log.error("******* Tenant Activity UI bundle is activated ******* "); } - } catch (Throwable e) { + } catch (Exception e) { log.error("******* Error in activating Tenant Activity UI bundle ******* ", e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/51e50310/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java index 3e317c5..9485ef0 100644 --- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java +++ b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java @@ -18,19 +18,17 @@ */ package org.apache.stratos.tenant.activity.internal; -import org.apache.stratos.tenant.activity.util.Util; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.transport.local.LocalTransportReceiver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.tenant.activity.util.Util; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.utils.ConfigurationContextService; -import java.lang.Throwable; - /** * @scr.component name="org.apache.stratos.tenant.activity" immediate="true" * @scr.reference name="registry.service" @@ -53,7 +51,7 @@ public class TenantActivityServiceComponent { if(log.isDebugEnabled()){ log.debug("******* Tenant Activity bundle is activated ******* "); } - } catch (Throwable e) { + } catch (Exception e) { log.error("******* Error in activating Tenant Activity bundle ******* ", e); } }
