core: avoid adding an invalid cache entry when using an unloaded infra

OpenRailAssociation · Jan 18, 2024 · 21b851e · 21b851e
1 parent 486129a
commit 21b851e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/src/main/java/fr/sncf/osrd/api/InfraManager.java b/core/src/main/java/fr/sncf/osrd/api/InfraManager.java
@@ -240,15 +240,15 @@ public InfraCacheEntry deleteFromInfraCache(String infraId) {
     public FullInfra getInfra(String infraId, String expectedVersion, DiagnosticRecorder diagnosticRecorder)
             throws OSRDError, InterruptedException {
         try {
-            infraCache.putIfAbsent(infraId, new InfraCacheEntry());
             var cacheEntry = infraCache.get(infraId);
-            // download the infra for tests
-            if (loadIfMissing) {
-                return load(infraId, expectedVersion, diagnosticRecorder);
+            if (cacheEntry == null || !cacheEntry.status.isStable) {
+                if (loadIfMissing) {
+                    // download the infra for tests
+                    return load(infraId, expectedVersion, diagnosticRecorder);
+                } else
+                    throw new OSRDError(ErrorType.InfraNotLoadedException);
             }
             var obsoleteVersion = expectedVersion != null && !expectedVersion.equals(cacheEntry.version);
-            if (!cacheEntry.status.isStable)
-                throw new OSRDError(ErrorType.InfraNotLoadedException);
             if (obsoleteVersion) {
                 deleteFromInfraCache(infraId);
                 throw new OSRDError(ErrorType.InfraInvalidVersionException);