You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by nd...@apache.org on 2002/03/10 00:12:04 UTC

cvs commit: jakarta-cactus/src/framework/share/org/apache/cactus/server AbstractTestCaller.java

ndlesiecki    02/03/09 15:12:04

  Modified:    src/framework/share/org/apache/cactus/server
                        AbstractTestCaller.java
  Log:
  added ThreadContext class loading. Did not seem to affect test results, but may nto provide addl. functionality. Will have to test functionality soon.
  
  Revision  Changes    Path
  1.10      +12 -3     jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestCaller.java
  
  Index: AbstractTestCaller.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestCaller.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractTestCaller.java	17 Feb 2002 20:03:24 -0000	1.9
  +++ AbstractTestCaller.java	9 Mar 2002 23:12:04 -0000	1.10
  @@ -74,8 +74,9 @@
    * provides a common abstraction for all test web requests.
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
  + * @author <a href="mailto:ndlesiecki@apache.org">Nicholas Lesiecki</a>
    *
  - * @version $Id: AbstractTestCaller.java,v 1.9 2002/02/17 20:03:24 vmassol Exp $
  + * @version $Id: AbstractTestCaller.java,v 1.10 2002/03/09 23:12:04 ndlesiecki Exp $
    */
   public abstract class AbstractTestCaller
   {
  @@ -296,7 +297,7 @@
           // Print info on the classloader used to load this class
           if (LOGGER.isDebugEnabled()) {
               StringBuffer buffer = new StringBuffer("Classloaders = ");
  -            ClassLoader classLoader = this.getClass().getClassLoader();
  +            ClassLoader classLoader = getAppropriateClassLoader();
               while (classLoader != null) {
                   buffer.append(classLoader.toString());
                   classLoader = classLoader.getParent();
  @@ -338,7 +339,7 @@
           // Get the class to call and build an instance of it.
           Class testClass = null;
           try {
  -            testClass = Class.forName(theClassName);
  +            testClass = Class.forName(theClassName, true, getAppropriateClassLoader());
           } catch (Exception e) {
               String message = "Error finding class [" + theClassName +
                   "] in classpath. ";
  @@ -357,4 +358,12 @@
           return testClass;
       }
   
  +    private ClassLoader getAppropriateClassLoader(){
  +        ClassLoader loader = Thread.currentThread().getContextClassLoader();
  +        if(loader == null){
  +            loader = this.getClass().getClassLoader();
  +        }
  +        return loader;
  +    }
  +    
   }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>