svn commit: r1233886 - /jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java

[se...@apache.org]

Author: sebb
Date: Fri Jan 20 12:58:09 2012
New Revision: 1233886

URL: http://svn.apache.org/viewvc?rev=1233886&view=rev
Log:
Fix failing test (temporarily)

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1233886&r1=1233885&r2=1233886&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Fri Jan 20 12:58:09 2012
@@ -395,15 +395,18 @@ public class SaveService {
     }
 
     // Allow test code to check for spurious class references
+    // TODO this test is wrong; aliases should never be deleted even if the class is dropped.
+    // It might still be worth checking that missing classes are present in upgrade.properties.
     static boolean checkClasses(){
+        final ClassLoader classLoader = SaveService.class.getClassLoader();
         boolean OK = true;
         for (Object clazz : classToAlias.keySet()) {
             String name = (String) clazz;
-            if (name.endsWith("JMSConfigGui")) { // deliberately kept
+            if (name.endsWith("JMSConfigGui") ||name.endsWith("BSFSamplerGui")) { // deliberately kept 
                 continue;
             }
             try {
-                Class.forName(name, false, SaveService.class.getClassLoader());
+                Class.forName(name, false, classLoader);
             } catch (ClassNotFoundException e) {
                 log.error(e.toString());
                 OK = false;