From ac334471f881c31de35dc58f823146a4262ab4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20H=C3=A4berling?= Date: Wed, 6 Sep 2023 02:19:16 -0700 Subject: [PATCH] Fix a few compiler warnings. --- src/main/kotlin/com/s13g/sauron/ImageRepository.kt | 2 +- src/main/kotlin/com/s13g/sauron/ImageServer.kt | 2 +- .../kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/s13g/sauron/ImageRepository.kt b/src/main/kotlin/com/s13g/sauron/ImageRepository.kt index 53ff010..722556b 100644 --- a/src/main/kotlin/com/s13g/sauron/ImageRepository.kt +++ b/src/main/kotlin/com/s13g/sauron/ImageRepository.kt @@ -87,7 +87,7 @@ class ImageRepository @VisibleForTesting internal constructor( // Build list of existing image repo files. try { mRootDirectory.walkFileTree { file -> - if (file.toString().toLowerCase().endsWith(".jpg")) { + if (file.toString().lowercase().endsWith(".jpg")) { mImageFiles.add(ImageRepoFile(file)) log.atInfo().log("INIT: Adding existing file: %s", file) } diff --git a/src/main/kotlin/com/s13g/sauron/ImageServer.kt b/src/main/kotlin/com/s13g/sauron/ImageServer.kt index c71c266..9760b20 100644 --- a/src/main/kotlin/com/s13g/sauron/ImageServer.kt +++ b/src/main/kotlin/com/s13g/sauron/ImageServer.kt @@ -135,7 +135,7 @@ class ImageServer { private fun serveMotionJpegFrame(outputStream: OutputStream): Long { // Make copy so that the response can take as long as it wants without blocking anything. val copyForRequest: ByteArray - var servedTimestamp = 0L + var servedTimestamp : Long synchronized(bytesLock) { copyForRequest = currentImageBytes.copyOf() servedTimestamp = lastModified diff --git a/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt b/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt index 1a93940..5e9dc94 100644 --- a/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt +++ b/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt @@ -21,7 +21,7 @@ fun createTestPictureTakerFrom(directory: File): PictureTaker { throw RuntimeException("Directory does not exist: " + directory.absolutePath) } val jpegFiles = directory.listFiles { _: File?, name: String -> - name.toLowerCase().endsWith(".jpg") + name.lowercase().endsWith(".jpg") } if (jpegFiles == null || jpegFiles.isEmpty()) { throw RuntimeException("No JPEG files in directory " + directory.absolutePath)