honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in version comparison

This commit is contained in:
Grahame Grieve 2023-09-13 21:37:56 -07:00
parent 518adf9826
commit fada7b2f50
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/TimeTracker.java
View File

@ -88,9 +88,15 @@ public class TimeTracker {
}
public String milestone() {
long start = milestone == 0 ? globalStart : milestone ;
long start = milestone == 0 ? globalStart : milestone;
milestone = System.nanoTime();
return DurationUtil.presentDuration(milestone - start);
}
public boolean longerThan(int i) {
long start = milestone == 0 ? globalStart : milestone;
long diff = (System.nanoTime() - start)/ 1000000;
return diff > i * 1000;
}
}

3
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
View File

@ -334,7 +334,8 @@ public class VersionUtilities {
if (pc!=null) {
if (pt.contains("-") && !pc.contains("-")) {
pt = pt.substring(0, pt.indexOf("-"));
return pt.compareTo(pc) >= 0;
int res = pc.compareTo(pt);
return res >= 0;
} else {
return compareVersionPart(pt, pc);
}

4
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java
View File

@ -53,4 +53,8 @@ public class VersionUtilitiesTest {
assertFalse(VersionUtilities.isThisOrLater("0.9.x", "0.8.1"));
}
@Test
public void bugFixTests() {
assertTrue(VersionUtilities.isThisOrLater("1.0.0-ballot", "1.0.1"));
}
}