Update mqtt credential null validation

JMRI · Jan 27, 2021 · 23978b8 · 23978b8
1 parent 275b12c
commit 23978b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/java/src/jmri/jmrix/AbstractNetworkConnectionConfig.java b/java/src/jmri/jmrix/AbstractNetworkConnectionConfig.java
@@ -358,15 +358,15 @@ public void loadDetails(final JPanel details) {
         mqttUsernameField.setText(adapter.getMqttUsername());
         mqttUsernameFieldLabel = new JLabel(Bundle.getMessage("MqttUsernameFieldLabel"));
         mqttUsernameField.setToolTipText(Bundle.getMessage("MqttUsernameToolTip"));
-        if (adapter.getMqttUsername() != null || adapter.getMqttUsername() != "") {
+        if (adapter.getMqttUsername() != null || ! "".equals(adapter.getMqttPassword())) {
             mqttUsernameField.setText(p.getComboBoxLastSelection(adapter.getClass().getName() + ".mqttusername"));
             adapter.setMqttUsername(mqttUsernameField.getText());
         }
 
         mqttPasswordField.setText(adapter.getMqttPassword());
         mqttPasswordFieldLabel = new JLabel(Bundle.getMessage("MqttPasswordFieldLabel"));
         mqttPasswordField.setToolTipText(Bundle.getMessage("MqttPasswordToolTip"));
-        if (adapter.getMqttPassword() != null || adapter.getMqttPassword() != "") {
+        if (adapter.getMqttPassword() != null || ! "".equals(adapter.getMqttPassword())) {
             mqttPasswordField.setText(p.getComboBoxLastSelection(adapter.getClass().getName() + ".mqttpassword"));
             adapter.setMqttPassword(String.valueOf(mqttPasswordField.getPassword()));
         }