From abdb022426b0d63b2a8ca6270f47f73b32fb9323 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Mon, 9 Dec 2013 20:46:45 -0800 Subject: [PATCH] Ticket #362: Cleaned up even more. --- .../connectiongroup/ConnectionGroupRESTService.java | 6 +++--- .../basic/rest/permission/PermissionRESTService.java | 2 +- .../guacamole/net/basic/rest/user/UserRESTService.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java index 8b71b58fa..6798fa332 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java @@ -239,7 +239,7 @@ public class ConnectionGroupRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while creating connection.", e); + logger.error("Unexpected GuacamoleException caught while creating connection group.", e); throw new HTTPException(Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -278,7 +278,7 @@ public class ConnectionGroupRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught updating connection.", e); + logger.error("Unexpected GuacamoleException caught updating connection group.", e); throw new HTTPException(Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -318,7 +318,7 @@ public class ConnectionGroupRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught moving connection.", e); + logger.error("Unexpected GuacamoleException caught moving connection group.", e); throw new HTTPException(Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/PermissionRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/PermissionRESTService.java index 10fccb85d..91d779dc4 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/PermissionRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/permission/PermissionRESTService.java @@ -159,7 +159,7 @@ public class PermissionRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught adding permission.", e); + logger.error("Unexpected GuacamoleException caught removing permission.", e); throw new HTTPException(Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java index be3704ac3..e9fa90b94 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java @@ -90,7 +90,7 @@ public class UserRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Response.Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while listing permissions.", e); + logger.error("Unexpected GuacamoleException caught while listing users.", e); throw new HTTPException(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -123,7 +123,7 @@ public class UserRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Response.Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while listing permissions.", e); + logger.error("Unexpected GuacamoleException caught while getting user.", e); throw new HTTPException(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -151,7 +151,7 @@ public class UserRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Response.Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while listing permissions.", e); + logger.error("Unexpected GuacamoleException caught while creating user.", e); throw new HTTPException(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -191,7 +191,7 @@ public class UserRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Response.Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while listing permissions.", e); + logger.error("Unexpected GuacamoleException caught while updating user.", e); throw new HTTPException(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } } @@ -224,7 +224,7 @@ public class UserRESTService { } catch(GuacamoleClientException e) { throw new HTTPException(Response.Status.BAD_REQUEST, e.getMessage() != null ? e.getMessage() : "Invalid Request."); } catch(GuacamoleException e) { - logger.error("Unexpected GuacamoleException caught while listing permissions.", e); + logger.error("Unexpected GuacamoleException caught while deleting user.", e); throw new HTTPException(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage() != null ? e.getMessage() : "Unexpected server error."); } }