fix isSameOrNewer version comparison

Boaz Avital · Boaz Avital · commit cd9b68ed164d · 2017-09-17T22:15:11.000-07:00
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/VersionHelper.java b/affinity/src/main/java/net/openhft/affinity/impl/VersionHelper.java
@@ -70,9 +70,12 @@ public boolean majorMinorEquals(final VersionHelper ver) {
 
     public boolean isSameOrNewer(final VersionHelper ver) {
         return ver != null
-                && this.major >= ver.major
-                && this.minor >= ver.minor
-                && this.release >= ver.release;
+                && (this.major > ver.major
+                    || (this.major == ver.major
+                        && this.minor > ver.minor)
+                    || (this.major == ver.major
+                        && this.minor == ver.minor
+                        && this.release >= ver.release));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,12 @@ public boolean majorMinorEquals(final VersionHelper ver) {`
`70`	`70`
`71`	`71`	`public boolean isSameOrNewer(final VersionHelper ver) {`
`72`	`72`	`return ver != null`
`73`		`- && this.major >= ver.major`
`74`		`- && this.minor >= ver.minor`
`75`		`- && this.release >= ver.release;`
	`73`	`+ && (this.major > ver.major`
	`74`	`+ \|\| (this.major == ver.major`
	`75`	`+ && this.minor > ver.minor)`
	`76`	`+ \|\| (this.major == ver.major`
	`77`	`+ && this.minor == ver.minor`
	`78`	`+ && this.release >= ver.release));`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`