prevent ContentService wrong initialization
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/560fca47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/560fca47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/560fca47 Branch: refs/heads/develop Commit: 560fca47daeaedefb35bcffdf369cede692db717 Parents: bbe79ee Author: Sergio Fernández <[email protected]> Authored: Fri Apr 5 19:29:41 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Fri Apr 5 19:29:41 2013 +0200 ---------------------------------------------------------------------- .../core/services/content/ContentServiceImpl.java | 35 ++++++++------- 1 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/560fca47/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java index a932511..e756c31 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java @@ -17,29 +17,30 @@ */ package org.apache.marmotta.platform.core.services.content; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.api.content.ContentReader; import org.apache.marmotta.platform.core.api.content.ContentService; import org.apache.marmotta.platform.core.api.content.ContentWriter; import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent; +import org.apache.marmotta.platform.core.events.SesameStartupEvent; import org.apache.marmotta.platform.core.exception.MarmottaException; import org.apache.marmotta.platform.core.exception.WritingNotSupportedException; import org.openrdf.model.Resource; import org.slf4j.Logger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - /** * Service that provides access to the content associated with a resource. It makes use of the ContentReader and * ContentWriter implementations registered in the system. @@ -67,12 +68,14 @@ public class ContentServiceImpl implements ContentService { private Map<Pattern,ContentWriter> writerMap; @Override - @PostConstruct public void initialise() { log.info("Content Service starting up ..."); - initialiseReadersWriters(); } + + protected void initialize(@Observes SesameStartupEvent event) { + initialise(); + } private void initialiseReadersWriters() { readerMap = new HashMap<Pattern, ContentReader>(); @@ -128,7 +131,7 @@ public class ContentServiceImpl implements ContentService { if(pattern != null && reader != null) { readerMap.put(pattern,reader); - log.info("enabled content reader '{}' for pattern {}",reader.getName(),pattern); + log.info("enabled content reader '{}' for pattern {}",reader.getName(), pattern); } if(pattern != null && writer != null) { writerMap.put(pattern,writer);
