From e4575dac128157fad6168166696497be93aec954 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahoo-inc.com>
Date: Tue, 30 May 2017 09:25:15 +0200
Subject: must check variable inside synchronized region

---
 vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'vespalog')

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('.');
-- 
cgit v1.2.3