You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2016/01/05 16:47:59 UTC
[50/50] [abbrv] stratos git commit: fixing some merge issues
fixing some merge issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/495ddb76
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/495ddb76
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/495ddb76
Branch: refs/heads/stratos-4.1.x
Commit: 495ddb76e8078939e7662ffba3de459f9790c1d8
Parents: 90dc062
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Jan 5 19:37:37 2016 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Jan 5 19:37:37 2016 +0530
----------------------------------------------------------------------
.../balancer/internal/LoadBalancerServiceComponent.java | 11 -----------
.../main/java/org/apache/stratos/aws/extension/Main.java | 4 ++++
2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/495ddb76/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 feedc9b..b235208 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
@@ -120,12 +120,6 @@ public class LoadBalancerServiceComponent {
// Configure topology filters
TopologyFilterConfigurator.configure(configuration);
-<<<<<<< HEAD
-// int threadPoolSize = Integer.getInteger(LoadBalancerConstants.LOAD_BALANCER_THREAD_POOL_SIZE_KEY,
-// LoadBalancerConstants.LOAD_BALANCER_DEFAULT_THREAD_POOL_SIZE);
-
-=======
->>>>>>> stratos-4.1.x
TopologyProvider topologyProvider = LoadBalancerConfiguration.getInstance().getTopologyProvider();
if (topologyProvider == null) {
topologyProvider = new TopologyProvider();
@@ -164,12 +158,7 @@ public class LoadBalancerServiceComponent {
}
}
-<<<<<<< HEAD
- private void startDomainMappingEventReceiver( TopologyProvider topologyProvider) {
-
-=======
private void startDomainMappingEventReceiver(TopologyProvider topologyProvider) {
->>>>>>> stratos-4.1.x
if (domainMappingEventReceiver != null) {
return;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/495ddb76/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java b/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java
index a8b436d..cf253fa 100644
--- a/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java
+++ b/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java
@@ -22,6 +22,10 @@ package org.apache.stratos.aws.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.stratos.common.threading.StratosThreadPool;
+import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
+import org.apache.stratos.load.balancer.extension.api.LoadBalancerExtension;
+import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExtensionException;
import java.util.concurrent.ThreadPoolExecutor;