Revision: 1134
          http://stripes.svn.sourceforge.net/stripes/?rev=1134&view=rev
Author:   fdaoud
Date:     2009-07-24 21:09:31 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
Fix for STS-667

Modified Paths:
--------------
    trunk/stripes/src/net/sourceforge/stripes/config/DefaultConfiguration.java
    trunk/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java

Modified: 
trunk/stripes/src/net/sourceforge/stripes/config/DefaultConfiguration.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/config/DefaultConfiguration.java  
2009-06-10 20:21:18 UTC (rev 1133)
+++ trunk/stripes/src/net/sourceforge/stripes/config/DefaultConfiguration.java  
2009-07-24 21:09:31 UTC (rev 1134)
@@ -14,11 +14,13 @@
  */
 package net.sourceforge.stripes.config;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -37,6 +39,7 @@
 import net.sourceforge.stripes.controller.LifecycleStage;
 import net.sourceforge.stripes.controller.NameBasedActionResolver;
 import net.sourceforge.stripes.controller.ObjectFactory;
+import net.sourceforge.stripes.controller.ObjectPostProcessor;
 import 
net.sourceforge.stripes.controller.multipart.DefaultMultipartWrapperFactory;
 import net.sourceforge.stripes.controller.multipart.MultipartWrapperFactory;
 import net.sourceforge.stripes.exception.DefaultExceptionHandler;
@@ -122,6 +125,19 @@
             if (this.objectFactory == null) {
                 this.objectFactory = new DefaultObjectFactory();
                 this.objectFactory.init(this);
+
+                if (this.objectFactory instanceof DefaultObjectFactory) {
+                    List<Class<? extends ObjectPostProcessor>> classes = 
getBootstrapPropertyResolver()
+                            .getClassPropertyList(ObjectPostProcessor.class);
+                    List<ObjectPostProcessor> instances = new 
ArrayList<ObjectPostProcessor>();
+                    for (Class<? extends ObjectPostProcessor> clazz : classes) 
{
+                        log.debug("Instantiating object post-processor ", 
clazz);
+                        instances.add(this.objectFactory.newInstance(clazz));
+                    }
+                    for (ObjectPostProcessor pp : instances) {
+                        ((DefaultObjectFactory) 
this.objectFactory).addPostProcessor(pp);
+                    }
+                }
             }
 
             this.actionResolver = initActionResolver();

Modified: 
trunk/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java  
2009-06-10 20:21:18 UTC (rev 1133)
+++ trunk/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java  
2009-07-24 21:09:31 UTC (rev 1134)
@@ -28,7 +28,6 @@
 import net.sourceforge.stripes.controller.Interceptor;
 import net.sourceforge.stripes.controller.LifecycleStage;
 import net.sourceforge.stripes.controller.ObjectFactory;
-import net.sourceforge.stripes.controller.ObjectPostProcessor;
 import net.sourceforge.stripes.controller.multipart.MultipartWrapperFactory;
 import net.sourceforge.stripes.exception.ExceptionHandler;
 import net.sourceforge.stripes.exception.StripesRuntimeException;
@@ -340,19 +339,5 @@
                 }
             }
         }
-
-        ObjectFactory factory = getObjectFactory();
-        if (factory instanceof DefaultObjectFactory) {
-            List<Class<? extends ObjectPostProcessor>> classes = 
getBootstrapPropertyResolver()
-                    .getClassPropertyList(ObjectPostProcessor.class);
-            List<ObjectPostProcessor> instances = new 
ArrayList<ObjectPostProcessor>();
-            for (Class<? extends ObjectPostProcessor> clazz : classes) {
-                log.debug("Instantiating object post-processor ", clazz);
-                instances.add(factory.newInstance(clazz));
-            }
-            for (ObjectPostProcessor pp : instances) {
-                ((DefaultObjectFactory) factory).addPostProcessor(pp);
-            }
-        }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to