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/01/28 18:52:22 UTC
[11/13] incubator-guacamole-client git commit: GUACAMOLE-47: Fix code
style issues.
GUACAMOLE-47: Fix code style issues.
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/ac086889
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ac086889
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ac086889
Branch: refs/heads/master
Commit: ac08688996efe621cbd0ed347fa734745667a36f
Parents: 1b9f7c5
Author: Nick Couchman <ni...@yahoo.com>
Authored: Wed Jan 25 12:46:55 2017 -0500
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Sat Jan 28 13:40:09 2017 -0500
----------------------------------------------------------------------
.../org/apache/guacamole/rest/APIRequest.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ac086889/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
index 5ee31e1..0101d62 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java
@@ -69,25 +69,23 @@ public class APIRequest extends HttpServletRequestWrapper {
super(request);
// Try a few methods to get client info.
- if(request.getHeader("X-Guacamole-Client-Hostname") != null && !request.getHeader("X-Guacamole-Client-Hostname").isEmpty()) {
+ if (request.getHeader("X-Guacamole-Client-Hostname") != null && !request.getHeader("X-Guacamole-Client-Hostname").isEmpty())
this.remoteHost = request.getHeader("X-Guacamole-Client-Hostname");
- } else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) {
+ else if (request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty())
this.remoteHost = request.getHeader("X-Forwarded-For");
- } else if(request.getRemoteHost() != null && !request.getRemoteHost().isEmpty()) {
+ else if (request.getRemoteHost() != null && !request.getRemoteHost().isEmpty())
this.remoteHost = request.getRemoteHost();
- } else {
+ else
this.remoteHost = null;
- }
- if(request.getHeader("X-Guacamole-Client-IP") != null && !request.getHeader("X-Guacamole-Client-IP").isEmpty()) {
+ if (request.getHeader("X-Guacamole-Client-IP") != null && !request.getHeader("X-Guacamole-Client-IP").isEmpty())
this.remoteAddr = request.getHeader("X-Guacamole-Client-IP");
- } else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty()) {
+ else if(request.getHeader("X-Forwarded-For") != null && !request.getHeader("X-Forwarded-For").isEmpty())
this.remoteAddr = request.getHeader("X-Forwarded-For");
- } else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty()) {
+ else if(request.getRemoteHost() != null && !request.getRemoteAddr().isEmpty())
this.remoteAddr = request.getRemoteAddr();
- } else {
+ else
this.remoteAddr = null;
- }
// Copy parameters from given MultivaluedMap
this.parameters = new HashMap<String, String[]>(parameters.size());