You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2021/02/03 19:45:58 UTC
[camel] branch master updated (3fb91b1 -> 380cc95)
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 3fb91b1 Upgrade Localstack image to 0.12.6 for SQS too
new 5511f40 DefaultManagementAgent#doStop: Small improvement to the warn log message.
new 380cc95 ExpressionClause#initPredicate: Fix race condition in double-checked locking object initialization
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/builder/ExpressionClause.java | 8 +++++---
.../java/org/apache/camel/management/DefaultManagementAgent.java | 4 +---
2 files changed, 6 insertions(+), 6 deletions(-)
[camel] 01/02: DefaultManagementAgent#doStop: Small improvement to
the warn log message.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5511f4080ea3a137299d3448ae73270f6a333707
Author: PascalSchumacher <pa...@gmx.net>
AuthorDate: Wed Feb 3 20:19:51 2021 +0100
DefaultManagementAgent#doStop: Small improvement to the warn log message.
---
.../main/java/org/apache/camel/management/DefaultManagementAgent.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index d75582d..2ab880d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -391,9 +391,7 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
}
if (caught > 0) {
- LOG.warn("A number of {} exceptions caught while unregistering MBeans during stop operation. See INFO log"
- + "for details.",
- caught);
+ LOG.warn("{} exceptions caught while unregistering MBeans during stop operation. See INFO log for details.", caught);
}
ServiceHelper.stopService(assembler);
[camel] 02/02: ExpressionClause#initPredicate: Fix race condition
in double-checked locking object initialization
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 380cc95cfa541d2502bd748e163a6bbaecc14b92
Author: PascalSchumacher <pa...@gmx.net>
AuthorDate: Wed Feb 3 20:32:44 2021 +0100
ExpressionClause#initPredicate: Fix race condition in double-checked locking object initialization
---
.../src/main/java/org/apache/camel/builder/ExpressionClause.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 1e002ef..6a2609d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -1004,12 +1004,14 @@ public class ExpressionClause<T> implements Expression, Predicate {
synchronized (this) {
if (pred == null) {
Expression newExpression = getExpressionValue();
+ Predicate newPredicate;
if (newExpression == null) {
- pred = delegate.getPredicateType().createPredicate(context);
+ newPredicate = delegate.getPredicateType().createPredicate(context);
} else {
- pred = ExpressionToPredicateAdapter.toPredicate(newExpression);
+ newPredicate = ExpressionToPredicateAdapter.toPredicate(newExpression);
}
- pred.initPredicate(context);
+ newPredicate.initPredicate(context);
+ pred = newPredicate;
}
}
}