svn commit: r1295432 - /axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java

[sagara]

Author: sagara
Date: Thu Mar  1 06:59:39 2012
New Revision: 1295432

URL: http://svn.apache.org/viewvc?rev=1295432&view=rev
Log:
Merged r1096134 to the 1.6 branch.

Modified:
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1295432&r1=1295431&r2=1295432&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 Thu Mar  1 06:59:39 2012
@@ -1029,12 +1029,14 @@ public abstract class DeploymentEngine i
      */
     protected void setClassLoaders(String axis2repoURI) throws 
DeploymentException {
         ClassLoader sysClassLoader =
-                
Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), 
axis2repoURI, false);
+                
Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), 
axis2repoURI,
+                        axisConfig.isChildFirstClassLoading());
 
         axisConfig.setSystemClassLoader(sysClassLoader);
         if (servicesDir.exists()) {
             axisConfig.setServiceClassLoader(
-                    Utils.getClassLoader(axisConfig.getSystemClassLoader(), 
servicesDir, axisConfig.isChildFirstClassLoading()));
+                    Utils.getClassLoader(axisConfig.getSystemClassLoader(), 
servicesDir,
+                            axisConfig.isChildFirstClassLoading()));
         } else {
             
axisConfig.setServiceClassLoader(axisConfig.getSystemClassLoader());
         }