#407 fix playlist cache problem

kagemomiji · Mar 30, 2024 · 3f9e58b · 3f9e58b
1 parent 85870a8
commit 3f9e58b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java
@@ -153,7 +153,7 @@ public List<MediaFile> getFilesInPlaylist(int id, boolean includeNotPresent) {
                 LOG.warn("Playlist {} not found", id);
                 return new ArrayList<>();
             }
-        ).stream().filter(x -> includeNotPresent || x.isPresent()).collect(Collectors.toList());
+        ).stream().filter(x -> x.isPresent() || includeNotPresent).collect(Collectors.toList());
     }
 
     @Transactional

diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/CacheConfiguration.java b/airsonic-main/src/main/java/org/airsonic/player/spring/CacheConfiguration.java
@@ -6,6 +6,7 @@
 import org.airsonic.player.domain.Playlist;
 import org.airsonic.player.domain.User;
 import org.airsonic.player.domain.UserSettings;
+import org.airsonic.player.service.cache.PlaylistCache.PlaylistUserList;
 import org.ehcache.config.builders.CacheConfigurationBuilder;
 import org.ehcache.config.builders.ConfigurationBuilder;
 import org.ehcache.config.builders.ExpiryPolicyBuilder;
@@ -97,7 +98,7 @@ private org.ehcache.config.Configuration createConfig(final ClassLoader cl) {
                                 .withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofDays(10)))
                                 .withService(cacheLogging))
                 .withCache(PLAYLIST_USERS_CACHE,
-                        CacheConfigurationBuilder.newCacheConfigurationBuilder(Integer.class, Object.class, pools)
+                        CacheConfigurationBuilder.newCacheConfigurationBuilder(Integer.class, PlaylistUserList.class, pools)
                                 .withClassLoader(cl)
                                 .withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofDays(10)))
                                 .withService(cacheLogging))