You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2018/02/27 15:55:22 UTC
[04/11] incubator-unomi git commit: UNOMI-159 add test to avoid
double load on startup
UNOMI-159 add test to avoid double load on startup
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/73774147
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/73774147
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/73774147
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 73774147696a9f2141494d5025c575e3ea1d7760
Parents: 244f0a4
Author: dgaillard <dg...@jahia.com>
Authored: Tue Feb 27 15:59:48 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Feb 27 15:59:48 2018 +0100
----------------------------------------------------------------------
.../unomi/router/services/AbstractConfigurationServiceImpl.java | 2 +-
.../apache/unomi/router/services/AbstractCustomServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/DefinitionsServiceImpl.java | 2 +-
.../java/org/apache/unomi/services/services/GoalsServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/ProfileServiceImpl.java | 2 +-
.../java/org/apache/unomi/services/services/RulesServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/SegmentServiceImpl.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
index 09b1d37..68011eb 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
@@ -53,7 +53,7 @@ public abstract class AbstractConfigurationServiceImpl implements SynchronousBun
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
index 4e36141..dc06fff 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
@@ -47,7 +47,7 @@ public class AbstractCustomServiceImpl implements SynchronousBundleListener {
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
index 478e11f..9f3c11c 100644
--- a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
@@ -70,7 +70,7 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
// process already started bundles
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
index 1323cbe..f9bd9c3 100644
--- a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
@@ -79,7 +79,7 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
loadPredefinedGoals(bundleContext);
loadPredefinedCampaigns(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedGoals(bundle.getBundleContext());
loadPredefinedCampaigns(bundle.getBundleContext());
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
index b42d8e7..895af37 100644
--- a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
@@ -102,7 +102,7 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
loadPropertyTypesFromPersistence();
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
index aea16aa..d3758ba 100644
--- a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
@@ -100,7 +100,7 @@ public class RulesServiceImpl implements RulesService, EventListenerService, Syn
loadPredefinedRules(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedRules(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
index e11f8a6..169efd7 100644
--- a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
@@ -118,7 +118,7 @@ public class SegmentServiceImpl extends AbstractServiceImpl implements SegmentSe
loadPredefinedSegments(bundleContext);
loadPredefinedScorings(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedSegments(bundle.getBundleContext());
loadPredefinedScorings(bundle.getBundleContext());
}