Skip to content

Commit 8f919fd

Browse files
committed
Updated based on review feed-back
1 parent 0500c22 commit 8f919fd

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

app/credentials-management/src/main/java/org/phoebus/applications/credentialsmanagement/CredentialsManagementController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public void loginToAll() {
229229
stage.close();
230230
}
231231
} catch (Exception e) {
232-
LOGGER.log(Level.WARNING, "Failed to delete all authentication tokens from key store", e);
232+
LOGGER.log(Level.WARNING, "Failed to login to all services", e);
233233
}
234234
}
235235

@@ -253,6 +253,9 @@ private void login(ServiceItem serviceItem, int expectedLoginCount) {
253253
if(expectedLoginCount == loggedInCount.get()){
254254
stage.close();
255255
}
256+
else{
257+
return;
258+
}
256259
} catch (Exception exception) {
257260
LOGGER.log(Level.WARNING, "Failed to store credentials", exception);
258261
}

app/credentials-management/src/main/resources/org/phoebus/applications/credentialsmanagement/CredentialsManagement.fxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Label text="%NoCredentialsFound" />
4141
</placeholder>
4242
<columns>
43-
<TableColumn fx:id="scopeColumn" style="-fx-alignment: CENTER-lEFT;" text="%Scope">
43+
<TableColumn fx:id="scopeColumn" style="-fx-alignment: CENTER-LEFT;" text="%Scope">
4444
<cellValueFactory>
4545
<PropertyValueFactory property="displayName" />
4646
</cellValueFactory>
@@ -56,7 +56,7 @@
5656
</cellValueFactory>
5757
</TableColumn>
5858
<TableColumn fx:id="actionButtonColumn" prefWidth="70.0" />
59-
<TableColumn fx:id="loginResultColumn" editable="false" prefWidth="150.0" style="-fx-alignment: CENTER-lEFT;" text="%LoginResult">
59+
<TableColumn fx:id="loginResultColumn" editable="false" prefWidth="150.0" style="-fx-alignment: CENTER-LEFT;" text="%LoginResult">
6060
<cellValueFactory>
6161
<PropertyValueFactory property="loginResultMessage" />
6262
</cellValueFactory>

app/logbook/olog/client-es/src/main/java/org/phoebus/applications/logbook/authentication/OlogServiceAuthenticationProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void authenticate(String username, String password) throws ConnectExcepti
4545
}
4646
catch (Exception e) {
4747
Logger.getLogger(OlogServiceAuthenticationProvider.class.getName())
48-
.log(Level.WARNING, "Failed to authenticate user " + username + " with logbook service", e);
48+
.log(Level.WARNING, "Failed to authenticate user " + username + " with logbook service");
4949
throw new ServiceAuthenticationException("Failed to authenticate user " + username + " with logbook service");
5050
}
5151
}

0 commit comments

Comments
 (0)