svn commit: r1098000 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java

[hl...@apache.org]

Author: hlship
Date: Fri Apr 29 22:55:50 2011
New Revision: 1098000

URL: http://svn.apache.org/viewvc?rev=1098000&view=rev
Log:
TAP5-853: Set up the component-layer PlasticProxyFactory with the correct parent class loader (the loader created for components)

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java?rev=1098000&r1=1097999&r2=1098000&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java Fri Apr 29 22:55:50 2011
@@ -134,12 +134,12 @@ public final class ComponentInstantiator
     {
         classFactory = new ClassFactoryImpl(parent, logger);
 
-        proxyFactory = new PlasticProxyFactoryImpl(classFactory, parent);
+        manager = new PlasticManager(parent, this, controlledPackageNames);
+
+        proxyFactory = new PlasticProxyFactoryImpl(classFactory, manager.getClassLoader());
 
         classToInstantiator.clear();
         classToModel.clear();
-
-        manager = null;
     }
 
     public synchronized Instantiator getInstantiator(final String className)
@@ -148,11 +148,6 @@ public final class ComponentInstantiator
 
         if (result == null)
         {
-            if (manager == null)
-            {
-                manager = new PlasticManager(parent, this, controlledPackageNames);
-            }
-
             // Force the creation of the class (and the transformation of the class). This will first
             // trigger transformations of any base classes.
 
@@ -192,8 +187,6 @@ public final class ComponentInstantiator
         assert InternalUtils.isNonBlank(packageName);
 
         controlledPackageNames.add(packageName);
-
-        manager = null;
     }
 
     public boolean exists(String className)