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/09/22 05:27:59 UTC
[camel] branch master updated: camel-ldif - fixed tests
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
The following commit(s) were added to refs/heads/master by this push:
new 8b4b6d0 camel-ldif - fixed tests
8b4b6d0 is described below
commit 8b4b6d0f53fe227a8f25139e64635291380f8740
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 22 07:27:27 2020 +0200
camel-ldif - fixed tests
---
.../src/test/java/org/apache/camel/component/ldif/LdifRouteTest.java | 4 +++-
.../apache/directory/server/core/integ5/DSAnnotationProcessor.java | 3 ---
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifRouteTest.java b/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifRouteTest.java
index 3815faf..68b120f 100644
--- a/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifRouteTest.java
+++ b/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifRouteTest.java
@@ -82,7 +82,9 @@ public class LdifRouteTest extends AbstractLdapTestUnit {
@AfterEach
public void tearDown() throws Exception {
- camel.stop();
+ if (camel != null) {
+ camel.stop();
+ }
}
@Test
diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
index cb4c102..79c5c28 100644
--- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
+++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
@@ -205,8 +205,6 @@ public final class DSAnnotationProcessor {
createPartition.cacheSize(),
new File(service.getInstanceLayout().getPartitionsDirectory(), createPartition.name()));
- partition.setCacheService(service.getCacheService());
-
CreateIndex[] indexes = createPartition.indexes();
for (CreateIndex createIndex : indexes) {
@@ -228,7 +226,6 @@ public final class DSAnnotationProcessor {
if (partition instanceof AbstractBTreePartition) {
AbstractBTreePartition btreePartition = (AbstractBTreePartition) partition;
- btreePartition.setCacheService(service.getCacheService());
btreePartition.setCacheSize(createPartition.cacheSize());
btreePartition.setPartitionPath(new File(
service
diff --git a/parent/pom.xml b/parent/pom.xml
index d87b46f..1f8b40f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,7 +47,7 @@
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.12.1</ahc-version>
<android-annotations-version>4.1.1.4</android-annotations-version>
- <apacheds-version>2.0.0.AM25</apacheds-version>
+ <apacheds-version>2.0.0.AM26</apacheds-version>
<apache-any23-version>2.3</apache-any23-version>
<apache-drill-version>1.18.0</apache-drill-version>
<apache-gora-version>0.9</apache-gora-version>