You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/12/11 00:17:54 UTC
svn commit: r1044533 - in /jakarta/jmeter/trunk/src:
core/org/apache/jmeter/gui/action/ActionRouter.java
reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
Author: sebb
Date: Fri Dec 10 23:17:54 2010
New Revision: 1044533
URL: http://svn.apache.org/viewvc?rev=1044533&view=rev
Log:
Revert changes to these files made in r1044445: causes GUI problems in populateCommandMap.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1044533&r1=1044532&r2=1044533&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Fri Dec 10 23:17:54 2010
@@ -42,9 +42,7 @@ import org.apache.log.Logger;
public final class ActionRouter implements ActionListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- static class SingletonHolder {
- static final ActionRouter INSTANCE = new ActionRouter();
- }
+ private static ActionRouter router;
private Map<String, Set<Command>> commands = new HashMap<String, Set<Command>>();
@@ -55,7 +53,6 @@ public final class ActionRouter implemen
new HashMap<String, HashSet<ActionListener>>();
private ActionRouter() {
- populateCommandMap();
}
public void actionPerformed(final ActionEvent e) {
@@ -308,6 +305,10 @@ public final class ActionRouter implemen
* @return The Instance value
*/
public static ActionRouter getInstance() {
- return SingletonHolder.INSTANCE;
+ if (router == null) {
+ router = new ActionRouter();
+ router.populateCommandMap();
+ }
+ return router;
}
}
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java?rev=1044533&r1=1044532&r2=1044533&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java Fri Dec 10 23:17:54 2010
@@ -42,9 +42,7 @@ import org.apache.log.Logger;
public final class ReportActionRouter implements ActionListener {
private Map<String, Set<Command>> commands = new HashMap<String, Set<Command>>();
- static class SingletonHolder {
- static final ReportActionRouter INSTANCE = new ReportActionRouter();
- }
+ private static ReportActionRouter router;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -55,7 +53,6 @@ public final class ReportActionRouter im
new HashMap<String, HashSet<ActionListener>>();
private ReportActionRouter() {
- populateCommandMap();
}
public void actionPerformed(final ActionEvent e) {
@@ -301,6 +298,10 @@ public final class ReportActionRouter im
* @return The Instance value
*/
public static ReportActionRouter getInstance() {
- return SingletonHolder.INSTANCE;
+ if (router == null) {
+ router = new ReportActionRouter();
+ router.populateCommandMap();
+ }
+ return router;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org