You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/04/12 16:35:49 UTC

[isis] branch master updated: ISIS-1935 removes temporary code fragments

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new e7aa001  ISIS-1935 removes temporary code fragments
e7aa001 is described below

commit e7aa001150f959881863bd95ddc3094242ace6a1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 12 18:35:45 2018 +0200

    ISIS-1935 removes temporary code fragments
---
 .../org/apache/isis/applib/services/eventbus/EventBusService.java    | 2 +-
 .../services/queryresultscache/QueryResultsCacheControlInternal.java | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
index a506df0..ecdf49e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
@@ -239,7 +239,7 @@ public abstract class EventBusService {
      * Lazily populates the event bus for the current {@link #getSubscribers() subscribers}.
      */
     @Programmatic
-    public EventBusImplementation getEventBusImplementation() {
+    protected EventBusImplementation getEventBusImplementation() {
         setupEventBus();
         return eventBusImplementation;
     }
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
index ecf34d9..8623f81 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControlInternal.java
@@ -42,11 +42,6 @@ public class QueryResultsCacheControlInternal extends AbstractSubscriber impleme
 
 		super.postConstruct();
 
-		final EventBusImplementation eventBus = eventBusService.getEventBusImplementation(); //TODO don't expose this
-		if(eventBus==null) {
-			return;
-		}
-
 		eventBusService.addEventListener(FixturesInstallingEvent.class, ev->{
 			fixturesInstalling = true;
 		});

-- 
To stop receiving notification emails like this one, please contact
ahuber@apache.org.