Merge pull request wso2#2116 from malakaganga/add_separate_worker_poo…

…l_183 Fix review comments
shilmyhasan · Jun 1, 2023 · 424de2c · 424de2c
2 parents cc0adfd + bc5b3af
commit 424de2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java
@@ -459,8 +459,7 @@ public void responseReceived(NHttpClientConnection conn) {
                 return;
             }
             if (targetResponse.isForceShutdownConnectionOnComplete() && conf.isConsumeAndDiscard()) {
-                ClientWorker clientWorker = new ClientWorker(targetConfiguration, requestMsgContext, targetResponse,
-                        allowedResponseProperties);
+                ClientWorker clientWorker = new ClientWorker(targetConfiguration, requestMsgContext, targetResponse);
                 targetConfiguration.getSecondaryWorkerPool().execute(new MessageDiscardWorker(requestMsgContext,
                         targetResponse, targetConfiguration, clientWorker, conn));
                 return;

diff --git a/.../src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java b/.../src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java
@@ -90,17 +90,17 @@ public int getWorkerPoolCoreSize() {
                 DEFAULT_WORKER_POOL_SIZE_CORE);
     }
     public int getSecondaryWorkerPoolCoreSize() {
-        return ConfigurationBuilderUtil.getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_SIZE_CORE,
-                DEFAULT_WORKER_POOL_SIZE_CORE, props);
+        return getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_SIZE_CORE,
+                DEFAULT_WORKER_POOL_SIZE_CORE);
     }
 
     public int getWorkerPoolMaxSize() {
         return getIntProperty(PassThroughConfigPNames.WORKER_POOL_SIZE_MAX,
                 DEFAULT_WORKER_POOL_SIZE_MAX);
     }
     public int getSecondaryWorkerPoolMaxSize() {
-        return ConfigurationBuilderUtil.getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_SIZE_MAX,
-                DEFAULT_WORKER_POOL_SIZE_MAX, props);
+        return getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_SIZE_MAX,
+                DEFAULT_WORKER_POOL_SIZE_MAX);
     }
 
     public int getWorkerThreadKeepaliveSec() {
@@ -109,8 +109,8 @@ public int getWorkerThreadKeepaliveSec() {
     }
 
     public int getSecondaryWorkerThreadKeepaliveSec() {
-        return ConfigurationBuilderUtil.getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_THREAD_KEEPALIVE_SEC,
-                DEFAULT_WORKER_THREAD_KEEPALIVE_SEC, props);
+        return getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_THREAD_KEEPALIVE_SEC,
+                DEFAULT_WORKER_THREAD_KEEPALIVE_SEC);
     }
 
     public int getWorkerPoolQueueLen() {
@@ -119,8 +119,8 @@ public int getWorkerPoolQueueLen() {
     }
 
     public int getSecondaryWorkerPoolQueueLen() {
-        return ConfigurationBuilderUtil.getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_QUEUE_LENGTH,
-                DEFAULT_WORKER_POOL_QUEUE_LENGTH, props);
+        return getIntProperty(PassThroughConfigPNames.SECONDARY_WORKER_POOL_QUEUE_LENGTH,
+                DEFAULT_WORKER_POOL_QUEUE_LENGTH);
     }
 
     public int getIOThreadsPerReactor() {