Return expiration on versioned read.

diff --git a/xmltooling/impl/MemoryStorageService.cpp b/xmltooling/impl/MemoryStorageService.cpp
index 697c55e..9fd63be 100644 (file)
--- a/xmltooling/impl/MemoryStorageService.cpp
+++ b/xmltooling/impl/MemoryStorageService.cpp
@@ -247,12 +247,12 @@ int MemoryStorageService::readString(const char* context, const char* key, strin
         return 0;
     else if (time(NULL) >= i->second.expiration)
         return 0;
+    if (pexpiration)
+        *pexpiration = i->second.expiration;
     if (i->second.version == version)
         return version; // nothing's changed, so just echo back the version
     if (pvalue)
         *pvalue = i->second.data;
-    if (pexpiration)
-        *pexpiration = i->second.expiration;
     return i->second.version;
 }