Fix null exception when creating a new podcast channel

Until the podcast channel has been updated to provide it with a title, there
is no point to doing any further processing since the directory where episodes
are stored is derived from the title.

While this change is unrelated to #176, it fixes the traceback shown in that
issue.
master
Evan Harris 5 years ago committed by jvoisin
parent 49c6e89f73
commit 3c5735e03e
  1. 7
      airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java

@ -177,7 +177,8 @@ public class PodcastService {
*/ */
public PodcastChannel getChannel(int channelId) { public PodcastChannel getChannel(int channelId) {
PodcastChannel channel = podcastDao.getChannel(channelId); PodcastChannel channel = podcastDao.getChannel(channelId);
addMediaFileIdToChannels(Arrays.asList(channel)); if (channel.getTitle() != null)
addMediaFileIdToChannels(Arrays.asList(channel));
return channel; return channel;
} }
@ -272,6 +273,10 @@ public class PodcastService {
private List<PodcastChannel> addMediaFileIdToChannels(List<PodcastChannel> channels) { private List<PodcastChannel> addMediaFileIdToChannels(List<PodcastChannel> channels) {
for (PodcastChannel channel : channels) { for (PodcastChannel channel : channels) {
try { try {
if (channel.getTitle() == null) {
LOG.warn("Podcast channel id {} has null title", channel.getId());
continue;
}
File dir = getChannelDirectory(channel); File dir = getChannelDirectory(channel);
MediaFile mediaFile = mediaFileService.getMediaFile(dir); MediaFile mediaFile = mediaFileService.getMediaFile(dir);
if (mediaFile != null) { if (mediaFile != null) {

Loading…
Cancel
Save