Commit 04f5846d9b70ec16c3f8f1e7db493c6461bf1b5c

Authored by 648540858
1 parent 60dfc69c

去除空指针异常

src/main/java/top/panll/assist/service/VideoFileService.java
... ... @@ -334,7 +334,9 @@ public class VideoFileService {
334 334 public String mergeOrCut(String app, String stream, Date startTime, Date endTime, String remoteHost) {
335 335 List<File> filesInTime = this.getFilesInTime(app, stream, startTime, endTime);
336 336 if (filesInTime== null || filesInTime.size() == 0){
337   - logger.info("此时间段未未找到视频文件, {}/{} {}->{}", app, stream, DateUtils.getDateTimeStr(startTime), DateUtils.getDateTimeStr(endTime));
  337 + logger.info("此时间段未未找到视频文件, {}/{} {}->{}", app, stream,
  338 + startTime == null? null:DateUtils.getDateTimeStr(startTime),
  339 + endTime == null? null:DateUtils.getDateTimeStr(endTime));
338 340 return null;
339 341 }
340 342 String taskId = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
... ...