diff options
4 files changed, 21 insertions, 20 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTempFolderProvider.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTempFolderProvider.java index d259919fb58..5627faf5abf 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTempFolderProvider.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTempFolderProvider.java @@ -55,7 +55,7 @@ public class ProjectTempFolderProvider extends LifecycleProviderAdapter { return projectTempFolder; } - private Path getBasePath(AnalysisProperties props) { + private static Path getBasePath(AnalysisProperties props) { String baseDir = props.property("sonar.projectBaseDir"); if (baseDir == null) { throw new IllegalStateException("sonar.projectBaseDir needs to be specified"); diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java index 838e8c54a11..7aba5f9c29d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java @@ -47,11 +47,11 @@ public class LogCallbackAppender extends UnsynchronizedAppenderBase<ILoggingEven return LogOutput.Level.WARN; case Level.INFO_INT: return LogOutput.Level.INFO; + case Level.TRACE_INT: + return LogOutput.Level.TRACE; case Level.DEBUG_INT: default: return LogOutput.Level.DEBUG; - case Level.TRACE_INT: - return LogOutput.Level.TRACE; } } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/WSLoaderProjectProvider.java b/sonar-batch/src/main/java/org/sonar/batch/scan/WSLoaderProjectProvider.java index 164354efb29..a56f82f1be1 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/WSLoaderProjectProvider.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/WSLoaderProjectProvider.java @@ -35,6 +35,7 @@ public class WSLoaderProjectProvider extends ProviderAdapter { public WSLoader provide(AnalysisProperties props, AnalysisMode mode, PersistentCache cache, ServerClient client) { if (wsLoader == null) { + // recreate cache directory if needed for this analysis cache.reconfigure(); wsLoader = new WSLoader(isCacheEnabled(props.properties(), mode.isPreview()), cache, client); wsLoader.setStrategy(getStrategy(mode)); diff --git a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java index e4c8bd02912..97a96acfb9e 100644 --- a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java +++ b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java @@ -164,44 +164,44 @@ public class PersistentCache { } private void lock() throws IOException { - lock_raf = new RandomAccessFile(getLockPath().toFile(), "rw"); - lock_fc = lock_raf.getChannel(); - lock = lock_fc.lock(); + lockRandomAccessFile = new RandomAccessFile(getLockPath().toFile(), "rw"); + lockChannel = lockRandomAccessFile.getChannel(); + lockFile = lockChannel.lock(); } - private RandomAccessFile lock_raf; - private FileChannel lock_fc; - private FileLock lock; + private RandomAccessFile lockRandomAccessFile; + private FileChannel lockChannel; + private FileLock lockFile; private void unlock() { - if (lock != null) { + if (lockFile != null) { try { - lock.release(); + lockFile.release(); } catch (IOException e) { logger.error("Error releasing lock", e); } } - if (lock_fc != null) { + if (lockChannel != null) { try { - lock_fc.close(); + lockChannel.close(); } catch (IOException e) { logger.error("Error closing file channel", e); } } - if (lock_raf != null) { + if (lockRandomAccessFile != null) { try { - lock_raf.close(); + lockRandomAccessFile.close(); } catch (IOException e) { logger.error("Error closing file", e); } } - lock = null; - lock_raf = null; - lock_fc = null; + lockFile = null; + lockRandomAccessFile = null; + lockChannel = null; } - private String getKey(String uri) { + private static String getKey(String uri) { try { MessageDigest digest = MessageDigest.getInstance(DIGEST_ALGO); digest.update(uri.getBytes(StandardCharsets.UTF_8)); @@ -245,7 +245,7 @@ public class PersistentCache { }; } - private void putCache(String key, byte[] value) throws UnsupportedEncodingException, IOException { + private void putCache(String key, byte[] value) throws IOException { Path cachePath = getCacheEntryPath(key); Files.write(cachePath, value, CREATE, WRITE, TRUNCATE_EXISTING); } |