svn commit: r232860 - in /jakarta/commons/sandbox/jci/trunk/src: java/org/apache/commons/jci/CompilingClassLoader.java test/org/apache/commons/jci/CompilingClassLoaderTestCase.java

[tcurdt]

Author: tcurdt
Date: Mon Aug 15 12:18:02 2005
New Revision: 232860

URL: http://svn.apache.org/viewcvs?rev=232860&view=rev
Log:
reload should not be called by the classloader itself


Modified:
    
jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/CompilingClassLoader.java
    
jakarta/commons/sandbox/jci/trunk/src/test/org/apache/commons/jci/CompilingClassLoaderTestCase.java

Modified: 
jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/CompilingClassLoader.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/CompilingClassLoader.java?rev=232860&r1=232859&r2=232860&view=diff
==============================================================================
--- 
jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/CompilingClassLoader.java
 (original)
+++ 
jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/CompilingClassLoader.java
 Mon Aug 15 12:18:02 2005
@@ -74,7 +74,5 @@
         }, repository);
         thread = new Thread(fam);         
         thread.start();
-        reload();        
-        
     }
 }

Modified: 
jakarta/commons/sandbox/jci/trunk/src/test/org/apache/commons/jci/CompilingClassLoaderTestCase.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/jci/trunk/src/test/org/apache/commons/jci/CompilingClassLoaderTestCase.java?rev=232860&r1=232859&r2=232860&view=diff
==============================================================================
--- 
jakarta/commons/sandbox/jci/trunk/src/test/org/apache/commons/jci/CompilingClassLoaderTestCase.java
 (original)
+++ 
jakarta/commons/sandbox/jci/trunk/src/test/org/apache/commons/jci/CompilingClassLoaderTestCase.java
 Mon Aug 15 12:18:02 2005
@@ -35,25 +35,16 @@
     }
 
     private void initialCompile() throws Exception {
-        delay();
-        
-        waitForSignal(reload);
-
-        writeFile("jci/Simple.java", Programs.simple);
-        
-        writeFile("jci/Extended.java", Programs.extended);
-        
+        delay();        
+        writeFile("jci/Simple.java", Programs.simple);        
+        writeFile("jci/Extended.java", Programs.extended);        
         waitForSignal(reload);
     }
     
     
     public void testCompileProblems() throws Exception {
-        delay();
-        
-        waitForSignal(reload);
-
+        delay();        
         writeFile("jci/Simple.java", Programs.error);
-
         waitForSignal(reload);
         
         // FIXME
@@ -78,8 +69,8 @@
         final Object extended = cl.loadClass("jci.Extended").newInstance();    
    
         assertTrue("Extended:Simple".equals(extended.toString()));
 
+        delay();
         writeFile("jci/Simple.java", Programs.SIMPLE);
-
         waitForSignal(reload);
     
         final Object SIMPLE = cl.loadClass("jci.Simple").newInstance();        
@@ -98,8 +89,8 @@
         final Object extended = cl.loadClass("jci.Extended").newInstance();    
    
         assertTrue("Extended:Simple".equals(extended.toString()));
         
+        delay();
         assertTrue(new File(directory, "jci/Extended.java").delete());
-        
         waitForSignal(reload);
 
         final Object oldSimple = cl.loadClass("jci.Simple").newInstance();     
   
@@ -113,9 +104,7 @@
         }
         
         delay();
-        
         FileUtils.deleteDirectory(new File(directory, "jci"));
-
         waitForSignal(reload);
 
         try {
@@ -136,8 +125,8 @@
         final Object extended = cl.loadClass("jci.Extended").newInstance();    
    
         assertTrue("Extended:Simple".equals(extended.toString()));
         
+        delay();
         assertTrue(new File(directory, "jci/Simple.java").delete());
-        
         waitForSignal(reload);
 
         try {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]