From 8aff7b6f5badae4e5951aac1d092b6ab7c744e66 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 8 Jun 2019 12:48:01 -0700 Subject: [PATCH] GUACAMOLE-422: Correct logic error in atLeast() - `this` version should be compared against `otherVersion`. --- .../apache/guacamole/protocol/GuacamoleProtocolVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java index a3ee25f0c..e52a7c2c2 100644 --- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java +++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java @@ -142,11 +142,11 @@ public class GuacamoleProtocolVersion { // If major is not the same, return inequality if (major != otherVersion.getMajor()) - return this.major > major; + return this.major > otherVersion.getMajor(); // Major is the same, but minor is not, return minor inequality if (minor != otherVersion.getMinor()) - return this.minor > minor; + return this.minor > otherVersion.getMinor(); // Major and minor are equal, so return patch inequality return patch >= otherVersion.getPatch();