Merge pull request #3113 from malakaganga/fix_registry

Fix registry not honoring cache expiration
wso2 · Feb 13, 2024 · 99cab9a · 99cab9a
2 parents 0b5dd61 + a692768
commit 99cab9a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...or.registry/src/main/java/org/wso2/micro/integrator/registry/MicroIntegratorRegistry.java b/...or.registry/src/main/java/org/wso2/micro/integrator/registry/MicroIntegratorRegistry.java
@@ -449,12 +449,14 @@ public RegistryEntry getRegistryEntry(String key) {
 
     private long getLastModifiedTimestamp(String filePath, URLConnection urlc) {
         Long lastModifiedFromMap = getResourceLastModifiedEntry(filePath);
+        Long urlLastModified = urlc.getLastModified(); // Get the last modified timestamp from urlc
         Long timestamp;
-        if (lastModifiedFromMap != null) {
+        if (lastModifiedFromMap != null && lastModifiedFromMap > urlLastModified) {
             timestamp = lastModifiedFromMap;
         } else {
-            timestamp = urlc.getLastModified();
+            timestamp = urlLastModified;
         }
+
         Long lastModifiedPropertiesFromMap = getResourceLastModifiedEntry(filePath + ".properties");
         if (lastModifiedPropertiesFromMap != null && lastModifiedPropertiesFromMap > timestamp) {
             timestamp = lastModifiedPropertiesFromMap;