Fix ContentTypeEngine initialization

pippo-java · May 22, 2015 · a3d22ac · a3d22ac
1 parent cbb8863
commit a3d22ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### [Unreleased][unreleased]
 
 #### Fixed
+- ContentTypeEngines were not properly initialized during the discovery/registration process 
+
 #### Changed
 #### Added
 #### Removed

diff --git a/pippo-core/src/main/java/ro/pippo/core/Application.java b/pippo-core/src/main/java/ro/pippo/core/Application.java
@@ -191,19 +191,16 @@ public boolean hasContentTypeEngine(String contentType) {
     }
 
     public void registerContentTypeEngine(Class<? extends ContentTypeEngine> engineClass) {
-        engines.registerContentTypeEngine(engineClass);
+        ContentTypeEngine engine = engines.registerContentTypeEngine(engineClass);
+        if (engine != null) {
+            engine.init(this);
+        }
     }
 
     public ContentTypeEngine getContentTypeEngine(String contentType) {
         return engines.getContentTypeEngine(contentType);
     }
 
-    public void setContentTypeEngine(ContentTypeEngine engine) {
-        engine.init(this);
-
-        engines.setContentTypeEngine(engine);
-    }
-
     public Router getRouter() {
         if (router == null) {
             router = new DefaultRouter();

diff --git a/pippo-core/src/main/java/ro/pippo/core/ContentTypeEngines.java b/pippo-core/src/main/java/ro/pippo/core/ContentTypeEngines.java
@@ -73,8 +73,9 @@ public List<String> getContentTypes() {
      * for the content type.
      *
      * @param engineClass
+     * @return the engine instance, if it is registered
      */
-    public void registerContentTypeEngine(Class<? extends ContentTypeEngine> engineClass) {
+    public ContentTypeEngine registerContentTypeEngine(Class<? extends ContentTypeEngine> engineClass) {
         ContentTypeEngine engine = null;
         try {
             engine = engineClass.newInstance();
@@ -83,9 +84,11 @@ public void registerContentTypeEngine(Class<? extends ContentTypeEngine> engineC
         }
         if (!engines.containsKey(engine.getContentType())) {
             setContentTypeEngine(engine);
+            return engine;
         } else {
             log.debug("'{}' content engine already registered, ignoring '{}'", engine.getContentType(),
                 engineClass.getName());
+            return null;
         }
     }