jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1337977 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Date Sun, 13 May 2012 20:10:41 GMT
Author: pmouawad
Date: Sun May 13 20:10:41 2012
New Revision: 1337977

URL: http://svn.apache.org/viewvc?rev=1337977&view=rev
Log:
Bug 53226 - Faster startup
Filter during search

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1337977&r1=1337976&r2=1337977&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Sun May 13 20:10:41
2012
@@ -255,25 +255,24 @@ public final class ActionRouter implemen
         try {
             List<String> listClasses = ClassFinder.findClassesThatExtend(
                     JMeterUtils.getSearchPaths(), 
-                    new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") });
// $NON-NLS-1$
+                    new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") },
// $NON-NLS-1$
+                    false, "org.apache.jmeter.gui", null, false); // $NON-NLS-1$
             commands = new HashMap<String, Set<Command>>(listClasses.size());
-            if (listClasses.size() == 0) {
+            if (listClasses.isEmpty()) {
                 log.fatalError("!!!!!Uh-oh, didn't find any action handlers!!!!!");
                 throw new JMeterError("No action handlers found - check JMeterHome and libraries");
             }
             for (String strClassName : listClasses) {
-                if (strClassName.startsWith("org.apache.jmeter.gui")) { // $NON-NLS-1$
-                    Class<?> commandClass = Class.forName(strClassName);
-                    if (!Modifier.isAbstract(commandClass.getModifiers())) {
-                        Command command = (Command) commandClass.newInstance();
-                        for (String commandName : command.getActionNames()) {
-                            Set<Command> commandObjects = commands.get(commandName);
-                            if (commandObjects == null) {
-                                commandObjects = new HashSet<Command>();
-                                commands.put(commandName, commandObjects);
-                            }
-                            commandObjects.add(command);
+                Class<?> commandClass = Class.forName(strClassName);
+                if (!Modifier.isAbstract(commandClass.getModifiers())) {
+                    Command command = (Command) commandClass.newInstance();
+                    for (String commandName : command.getActionNames()) {
+                        Set<Command> commandObjects = commands.get(commandName);
+                        if (commandObjects == null) {
+                            commandObjects = new HashSet<Command>();
+                            commands.put(commandName, commandObjects);
                         }
+                        commandObjects.add(command);
                     }
                 }
             }



Mime
View raw message