summaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-05-30 09:25:15 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-05-30 09:25:15 +0200
commite4575dac128157fad6168166696497be93aec954 (patch)
tree8b119de6769bddd7a3883bdbef0bb8476c3507ab /vespalog
parent771bea4326f1e33baa9b5d1a3d65788df4f972de (diff)
must check variable inside synchronized region
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
index a3a69e8f4ed..5e75b10b302 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
@@ -155,6 +155,9 @@ public class VespaLevelControllerRepo implements LevelControllerRepo {
return ctrl;
}
synchronized(this) {
+ if (ctlFile == null) {
+ return defaultLevelCtrl;
+ }
LevelController inherit = null;
int lastdot = suffix.lastIndexOf('.');