diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java index 193e72a2fe..95a7103dea 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java @@ -59,7 +59,8 @@ abstract class AbstractJMSProcessor extends AbstractProcess .name("User Name") .description("User Name used for authentication and authorization.") .required(false) - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR) .build(); static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder() .name("Password") @@ -205,7 +206,7 @@ abstract class AbstractJMSProcessor extends AbstractProcess final UserCredentialsConnectionFactoryAdapter cfCredentialsAdapter = new UserCredentialsConnectionFactoryAdapter(); cfCredentialsAdapter.setTargetConnectionFactory(connectionFactory); - cfCredentialsAdapter.setUsername(context.getProperty(USER).getValue()); + cfCredentialsAdapter.setUsername(context.getProperty(USER).evaluateAttributeExpressions().getValue()); cfCredentialsAdapter.setPassword(context.getProperty(PASSWORD).getValue()); final CachingConnectionFactory cachingFactory = new CachingConnectionFactory(cfCredentialsAdapter);