2 files changed, 12 insertions, 1 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/SecurityManagement.java b/server/sonar-process/src/main/java/org/sonar/process/SecurityManagement.java
index 79674ad17bc..7a2d32f4fc5 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/SecurityManagement.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/SecurityManagement.java
@@ -89,7 +89,8 @@ public class SecurityManagement {
     }
 
     String getDomainClassLoaderName(ProtectionDomain domain) {
-      return domain.getClassLoader().getClass().getName();
+      ClassLoader classLoader = domain.getClassLoader();
+      return classLoader != null ? classLoader.getClass().getName() : null;
     }
   }
 }
diff --git a/server/sonar-process/src/test/java/org/sonar/process/SecurityManagementTest.java b/server/sonar-process/src/test/java/org/sonar/process/SecurityManagementTest.java
index 9bf0afaf57c..b3def5ce1b6 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/SecurityManagementTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/SecurityManagementTest.java
@@ -22,6 +22,7 @@ package org.sonar.process;
 import java.security.Permission;
 import java.security.ProtectionDomain;
 import java.security.SecurityPermission;
+import javax.management.MBeanPermission;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -66,4 +67,13 @@ public class SecurityManagementTest {
     assertThat(policy.implies(pd, allowedRuntime)).isTrue();
     assertThat(policy.implies(pd, deniedRuntime)).isTrue();
   }
+
+  @Test
+  public void protection_domain_can_have_no_classloader() {
+    SecurityManagement.CustomPolicy policy = new SecurityManagement.CustomPolicy();
+    ProtectionDomain domain = new ProtectionDomain(null, null, null, null);
+    Permission permission = new MBeanPermission("com.sun.management.internal.HotSpotThreadImpl", "getMBeanInfo");
+
+    assertThat(policy.implies(domain, permission)).isTrue();
+  }
 }