/*******************************************************************************
 *
 *    Copyright (C) 2015-2017 the BBoxDB project
 *  
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *  
 *      http://www.apache.org/licenses/LICENSE-2.0
 *  
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License. 
 *    
 *******************************************************************************/
package org.bboxdb.misc;

import java.io.IOException;
import java.io.InputStream;
import java.net.URL;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;

public class BBoxDBConfigurationManager {

	/**
	 * The configuration of the software
	 */
	protected static BBoxDBConfiguration configuration;
	
	/**
	 * The Logger
	 */
	private final static Logger logger = LoggerFactory.getLogger(BBoxDBConfigurationManager.class);

	
	/**
	 * Get the configuration of the BBoxDB
	 * @return
	 */
	public static synchronized BBoxDBConfiguration getConfiguration() {
		
		if(configuration == null) {
			loadConfiguration();
		}
		
		return configuration;
	}

	/**
	 * Load the configuration of the BBoxDB from the classpath
	 */
	public static void loadConfiguration() {
		final ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); 
		final URL inputFile = classLoader.getResource(Const.CONFIG_FILE);
		
		if(inputFile == null) {
			configuration = new BBoxDBConfiguration();
			logger.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
			logger.warn("!! No configuration file found, using default values !!");
			logger.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
			return;
		}
		
		try (final InputStream inputStream = inputFile.openStream()) {
			logger.info("Loading configuration from: " + inputFile); 
			
	        final Yaml yaml = new Yaml(); 
	        configuration = yaml.loadAs(inputStream, BBoxDBConfiguration.class);
		} catch(IOException e) {
			logger.error("Exception while loading configuration", e);
			throw new RuntimeException(e);
		}
	}
	
}

@@ -1688,16 +1688,117 @@
 der(); %0A
+%09%09%0A%09%09if(classLoader == null) %7B%0A%09%09%09throw new IllegalArgumentException(%22Got null classloader%22);%0A%09%09%7D%0A%09%09%0A
 %09%09final 

Handle possible NPE