Fixing TTL logic on getValueExpiryRaw

Author: PicoCreator

src/main/java/picoded/dstack/redisson/Redisson_KeyValueMap.java

@@ -270,10 +270,19 @@ public MutablePair<String, Long> getValueExpiryRaw(String key, long now) {
 			}
 			String value = entry.getValue();
 
-			Long expireObj = backendMap().remainTimeToLive(key) + System.currentTimeMillis();
-			// Note: 0 = no timestamp, hence valid value
-			long expiry = expireObj.longValue();
-			return new MutablePair<String, Long>(value, expiry);
+			// Get the raw TTL
+			long rawTTL = backendMap().remainTimeToLive(key);
+			if( rawTTL <= -2 ) {
+				// value has expired
+				return null;
+			} else if( rawTTL <= -1 ) {
+				// has no expiry
+				// Note: 0 = no timestamp, hence valid value
+				return new MutablePair<String, Long>(value, 0);
+			}
+			
+			// Return with expiry value
+			return new MutablePair<String, Long>(value, rawTTL + System.currentTimeMillis());
 		}
 		return null;
 	}