You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2024/08/20 09:04:36 UTC
(jackrabbit-filevault) 01/01: JCRVLT-778 Always return singleton INFINITE for empty string in fromString(String)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/always-use-infinite-constant-in-versionranges
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 8eed70ab8a0d9bd98fe33c7685ecab80a566168a
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Aug 20 11:04:20 2024 +0200
JCRVLT-778 Always return singleton INFINITE for empty string in
fromString(String)
This reduces memory footprint
---
.../java/org/apache/jackrabbit/vault/packaging/VersionRange.java | 2 +-
.../org/apache/jackrabbit/vault/packaging/VersionRangeTest.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/VersionRange.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/VersionRange.java
index 09906a31..90ceb9e0 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/VersionRange.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/VersionRange.java
@@ -228,7 +228,7 @@ public class VersionRange {
return new VersionRange(vLow, linc, vHigh, hinc);
} else if (str.length() == 0) {
// infinite range
- return new VersionRange(null, false, null, false);
+ return VersionRange.INFINITE;
} else {
// simple range where given version is minimum
return new VersionRange(Version.create(str), true, null, false);
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/VersionRangeTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/VersionRangeTest.java
index d88b4c7a..c8356049 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/VersionRangeTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/VersionRangeTest.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.vault.packaging;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -196,6 +197,12 @@ public class VersionRangeTest {
assertEquals(true, vr.isHighInclusive());
}
+ @Test
+ public void testParseEmptyString() {
+ VersionRange vr = VersionRange.fromString("");
+ assertSame(VersionRange.INFINITE, vr); // always return same instance
+ }
+
@Test
public void testToString() {
VersionRange vr = new VersionRange(v1, true, v2, true);