[nifi] branch master updated: NIFI-6144 - Enable EL on listening port in HandleHttpRequest

[ijokarumawak]

This is an automated email from the ASF dual-hosted git repository.

ijokarumawak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new ead6a3b  NIFI-6144 - Enable EL on listening port in HandleHttpRequest
ead6a3b is described below

commit ead6a3b842422ca4dd9a34482e162ca80a0a55c5
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Sun Mar 24 12:21:21 2019 +0100

    NIFI-6144 - Enable EL on listening port in HandleHttpRequest
    
    This closes #3386.
    
    Signed-off-by: Koji Kawamura <ijokaruma...@apache.org>
---
 .../java/org/apache/nifi/processors/standard/HandleHttpRequest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
index d03774e..fdd4d3d 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
@@ -153,7 +153,7 @@ public class HandleHttpRequest extends AbstractProcessor {
             .description("The Port to listen on for incoming HTTP requests")
             .required(true)
             .addValidator(StandardValidators.createLongValidator(0L, 65535L, 
true))
-            .expressionLanguageSupported(ExpressionLanguageScope.NONE)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .defaultValue("80")
             .build();
     public static final PropertyDescriptor HOSTNAME = new 
PropertyDescriptor.Builder()
@@ -326,7 +326,7 @@ public class HandleHttpRequest extends AbstractProcessor {
         }
         this.containerQueue = new 
LinkedBlockingQueue<>(context.getProperty(CONTAINER_QUEUE_SIZE).asInteger());
         final String host = context.getProperty(HOSTNAME).getValue();
-        final int port = context.getProperty(PORT).asInteger();
+        final int port = 
context.getProperty(PORT).evaluateAttributeExpressions().asInteger();
         final SSLContextService sslService = 
context.getProperty(SSL_CONTEXT).asControllerService(SSLContextService.class);
         final HttpContextMap httpContextMap = 
context.getProperty(HTTP_CONTEXT_MAP).asControllerService(HttpContextMap.class);
         final long requestTimeout = 
httpContextMap.getRequestTimeout(TimeUnit.MILLISECONDS);