You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/10/27 17:51:05 UTC
[21/24] incubator-guacamole-client git commit: GUACAMOLE-362: Fix
style and error messages.
GUACAMOLE-362: Fix style and error messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ab41f441
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ab41f441
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ab41f441
Branch: refs/heads/staging/0.9.14-incubating
Commit: ab41f441003bb5524509fc22aeb130184dab271f
Parents: bd57938
Author: Nick Couchman <vn...@apache.org>
Authored: Sun Oct 1 07:06:20 2017 -0400
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Fri Oct 27 13:05:13 2017 -0400
----------------------------------------------------------------------
.../guacamole/auth/cas/ticket/TicketValidationService.java | 1 +
.../apache/guacamole/properties/PrivateKeyGuacamoleProperty.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab41f441/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
index 482c73a..009f955 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
@@ -63,6 +63,7 @@ public class TicketValidationService {
*
* @param ticket
* The ID ticket to validate and parse.
+ *
* @param credentials
* The Credentials object to store retrieved username and
* password values in.
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab41f441/guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java
index 570b776..174f183 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java
@@ -70,10 +70,10 @@ public abstract class PrivateKeyGuacamoleProperty implements GuacamoleProperty<P
throw new GuacamoleServerException("Could not read in the specified key file.", e);
}
catch (NoSuchAlgorithmException e) {
- throw new GuacamoleServerException("Key is not in expected RSA algorithm.", e);
+ throw new GuacamoleServerException("RSA algorithm is not available.", e);
}
catch (InvalidKeySpecException e) {
- throw new GuacamoleServerException("KeyS is not in expected PKCS8 encoding.", e);
+ throw new GuacamoleServerException("Key is not in expected PKCS8 encoding.", e);
}
}