You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/20 05:10:24 UTC
[camel] 02/02: CAMEL-14594: Fixed NPE
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1034a22e5326702f090a5a890d2e557f3fa7d06c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 20 05:55:58 2020 +0100
CAMEL-14594: Fixed NPE
---
.../org/apache/camel/impl/engine/DefaultProducerCache.java | 14 +++++++++-----
.../org/apache/camel/impl/engine/EmptyProducerCache.java | 5 -----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
index a145d5b..1db1029 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
@@ -315,7 +315,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
}
// release back to the pool
- producers.release(endpoint, producer);
+ releaseProducer(endpoint, producer);
} finally {
callback.done(doneSync);
}
@@ -375,7 +375,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
@Override
public int size() {
- int size = producers.size();
+ int size = producers != null ? producers.size() : 0;
LOG.trace("size = {}", size);
return size;
@@ -389,8 +389,10 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
@Override
public synchronized void purge() {
try {
- producers.stop();
- producers.start();
+ if (producers != null) {
+ producers.stop();
+ producers.start();
+ }
} catch (Exception e) {
LOG.debug("Error restarting producers", e);
}
@@ -401,7 +403,9 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
@Override
public void cleanUp() {
- producers.cleanUp();
+ if (producers != null) {
+ producers.cleanUp();
+ }
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java
index 6b62070..6768850 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java
@@ -64,11 +64,6 @@ public class EmptyProducerCache extends DefaultProducerCache {
}
@Override
- public int size() {
- return 0;
- }
-
- @Override
public int getCapacity() {
return 0;
}