Skip to content

NIFI-6391 Prevent excessive JMS connections #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
slyouts wants to merge 1 commit into from
Closed

NIFI-6391 Prevent excessive JMS connections #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.ssl.SSLContextService.ClientAuth;
import org.slf4j.Logger;
Expand Down Expand Up @@ -143,7 +142,9 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String
public void resetConnectionFactory(ConnectionFactory cachedFactory) {
if (cachedFactory == connectionFactory) {
getLogger().debug("Resetting connection factory");
connectionFactory = null;
ConfigurationContext context = getConfigurationContext();
this.createConnectionFactoryInstance(context);
this.setConnectionFactoryProperties(context);
}
}

Expand All @@ -160,7 +161,7 @@ public ConnectionFactory getConnectionFactory() {
}

@OnEnabled
public void enable(ConfigurationContext context) throws InitializationException {
public void enable(ConfigurationContext context) {
try {
if (!this.configured) {
if (logger.isInfoEnabled()) {
Expand Down
1 change: 1 addition & 0 deletions ...ifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro
try {
// Safe to cast. Method #buildTargetResource(ProcessContext context) sets only CachingConnectionFactory
CachingConnectionFactory currentCF = (CachingConnectionFactory)worker.jmsTemplate.getConnectionFactory();
worker.shutdown();
cfProvider.resetConnectionFactory(currentCF.getTargetConnectionFactory());
worker = buildTargetResource(context);
}catch(Exception e) {
Expand Down