From b9e3788ffa177e839054bdfc266390ac4fd89aa4 Mon Sep 17 00:00:00 2001 From: javasabr Date: Tue, 10 Oct 2017 06:12:55 +0300 Subject: [PATCH] fixed NPE when you try to remove an unused asset loader. --- jme3-core/src/main/java/com/jme3/asset/ImplHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java index 3bbd19c14..87acd1c7e 100644 --- a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java +++ b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java @@ -32,6 +32,7 @@ package com.jme3.asset; import com.jme3.asset.cache.AssetCache; + import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -282,6 +283,7 @@ final class ImplHandler { ImplThreadLocal local = classToLoaderMap.get(loaderType); // Remove it from the class->loader map classToLoaderMap.remove(loaderType); + if (local == null) return; // Remove it from the extension->loader map for (String extension : local.getExtensions()){ extensionToLoaderMap.remove(extension);