[mule-scm] [mule] [15989] branches/mule-2.2.x/core/src/main/java/org/mule/config/bootstrap: ongoing code cleanup

[dirk.olmes]

Some parts of this message have been removed. Learn more about Nabble's security policy.

Revision

15989

Author

dirk.olmes

Date

2009-11-06 09:39:54 -0600 (Fri, 06 Nov 2009)

Log Message

ongoing code cleanup

Modified Paths

• branches/mule-2.2.x/core/src/main/java/org/mule/config/bootstrap/SimpleRegistryBootstrap.java
• branches/mule-2.2.x/modules/spring-config/src/main/java/org/mule/config/spring/MuleApplicationContext.java

Diff

Modified: branches/mule-2.2.x/core/src/main/java/org/mule/config/bootstrap/SimpleRegistryBootstrap.java (15988 => 15989)

--- branches/mule-2.2.x/core/src/main/java/org/mule/config/bootstrap/SimpleRegistryBootstrap.java	2009-11-06 10:44:33 UTC (rev 15988)
+++ branches/mule-2.2.x/core/src/main/java/org/mule/config/bootstrap/SimpleRegistryBootstrap.java	2009-11-06 15:39:54 UTC (rev 15989)
@@ -116,7 +116,6 @@
         registerUnnamedObjects(props, context.getRegistry());
         //this must be called last as it clears the properties map
         registerObjects(props, context.getRegistry());
-
     }
 
     private void registerTransformers(Properties props, MuleRegistry registry) throws Exception
@@ -142,7 +141,6 @@
             final String transClass = (x == -1 ? transString : transString.substring(0, x));
             try
             {
-
                 if (returnClassString != null)
                 {
                     if (returnClassString.equals("byte[]"))

Modified: branches/mule-2.2.x/modules/spring-config/src/main/java/org/mule/config/spring/MuleApplicationContext.java (15988 => 15989)

--- branches/mule-2.2.x/modules/spring-config/src/main/java/org/mule/config/spring/MuleApplicationContext.java	2009-11-06 10:44:33 UTC (rev 15988)
+++ branches/mule-2.2.x/modules/spring-config/src/main/java/org/mule/config/spring/MuleApplicationContext.java	2009-11-06 15:39:54 UTC (rev 15989)
@@ -57,7 +57,8 @@
         this.springResources = springResources;
     }
 
-    protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) {
+    protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) 
+    {
         super.prepareBeanFactory(beanFactory);
         beanFactory.addBeanPostProcessor(new MuleContextPostProcessor(muleContext));
         beanFactory.addBeanPostProcessor(new ExpressionEvaluatorPostProcessor(muleContext));
@@ -109,7 +110,7 @@
     {
         //Copy all postProcessors defined in the defaultMuleConfig so that they get applied to the child container
         DefaultListableBeanFactory bf = super.createBeanFactory();
-        if(getParent()!=null)
+        if (getParent() != null)
         {
             //Copy over all processors
             AbstractBeanFactory beanFactory = (AbstractBeanFactory)getParent().getAutowireCapableBeanFactory();

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email