You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2010/01/27 21:24:18 UTC
svn commit: r903818 -
/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
Author: sebb
Date: Wed Jan 27 20:24:17 2010
New Revision: 903818
URL: http://svn.apache.org/viewvc?rev=903818&view=rev
Log:
Useless null check
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=903818&r1=903817&r2=903818&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Wed Jan 27 20:24:17 2010
@@ -154,18 +154,16 @@
private String getPassword() {
String password = this.defaultpw;
if (null == password) {
- if (null == defaultpw) {
- this.defaultpw = System.getProperty(KEY_STORE_PASSWORD);
+ this.defaultpw = System.getProperty(KEY_STORE_PASSWORD);
- if (null == defaultpw) {
- synchronized (this) {
- this.defaultpw = JOptionPane.showInputDialog(
- GuiPackage.getInstance().getMainFrame(),
- JMeterUtils.getResString("ssl_pass_prompt"), // $NON-NLS-1$
- JMeterUtils.getResString("ssl_pass_title"), // $NON-NLS-1$
- JOptionPane.QUESTION_MESSAGE);
- System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
- }
+ if (null == defaultpw) {
+ synchronized (this) {
+ this.defaultpw = JOptionPane.showInputDialog(
+ GuiPackage.getInstance().getMainFrame(),
+ JMeterUtils.getResString("ssl_pass_prompt"), // $NON-NLS-1$
+ JMeterUtils.getResString("ssl_pass_title"), // $NON-NLS-1$
+ JOptionPane.QUESTION_MESSAGE);
+ System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org