This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.discovery.oak-1.0.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git

commit f32fadf5b356742ffc24ee58544f5e0930aa9e51
Author: Stefan Egli <[email protected]>
AuthorDate: Thu Oct 22 16:05:09 2015 +0000

    SLING-5173 : re-added complete consistency-history after introducing 
splitting them and using the ConsistencyServiceChain. Probably should be 
refactored into something slightly nicer though
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1710047
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/discovery/oak/OakDiscoveryService.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java 
b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
index 1a5c8d3..0b27f95 100644
--- a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
@@ -61,6 +61,7 @@ import 
org.apache.sling.discovery.commons.providers.DefaultInstanceDescription;
 import org.apache.sling.discovery.commons.providers.ViewStateManager;
 import 
org.apache.sling.discovery.commons.providers.base.ViewStateManagerFactory;
 import org.apache.sling.discovery.commons.providers.spi.ConsistencyService;
+import 
org.apache.sling.discovery.commons.providers.spi.base.ConsistencyHistory;
 import 
org.apache.sling.discovery.commons.providers.spi.base.ConsistencyServiceChain;
 import org.apache.sling.discovery.commons.providers.spi.base.IdMapService;
 import 
org.apache.sling.discovery.commons.providers.spi.base.OakBacklogConsistencyService;
@@ -211,6 +212,10 @@ public class OakDiscoveryService extends 
BaseDiscoveryService {
 
         ConsistencyService consistencyService;
         if (config.getSyncTokenEnabled()) {
+            //TODO: ConsistencyHistory is implemented a little bit hacky ..
+            ConsistencyHistory consistencyHistory = new ConsistencyHistory();
+            
oakBacklogConsistencyService.setConsistencyHistory(consistencyHistory);
+            
syncTokenConsistencyService.setConsistencyHistory(consistencyHistory);
             consistencyService = new 
ConsistencyServiceChain(oakBacklogConsistencyService, 
syncTokenConsistencyService);
         } else {
             consistencyService = oakBacklogConsistencyService;

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to