package com.orbekk.same.config;

import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class Configuration {
    public final static String configurationProperty =
            "com.orbekk.same.config.file";
            
    static final Logger logger = LoggerFactory.getLogger(Configuration.class);
    Properties configuration = new Properties();
    
    public Configuration(Properties properties) {
        this.configuration = properties;
    }
    
    Configuration() {
        // Use factory methods.
    }
    
    public static Configuration loadOrDie() {
        Configuration configuration = new Configuration();
        boolean status = configuration.loadDefault();
        if (!status) {
            logger.error("Could not load configurotion.");
            System.exit(1);
        }
        return configuration;
    }
    
    public static Configuration load() {
        Configuration configuration = new Configuration();
        configuration.loadDefault();
        return configuration;
    }
    
    public boolean loadDefault() {
        String filename = System.getProperty(configurationProperty);
        if (filename != null) {
            try {
                configuration.load(new FileReader(filename));
                return true;
            } catch (FileNotFoundException e) {
                logger.error("Failed to load configuration. {}", e);
                logger.error("Failed to load configuration. {}={}",
                        configurationProperty, filename);
            } catch (IOException e) {
                logger.error("Failed to load configuration. {}", e);
                logger.error("Failed to load configuration. {}={}",
                        configurationProperty, filename);
            }
        } else {
            logger.error("Failed to load configuration. {}={}",
                    configurationProperty, filename);
        }
        return false;
    }
    
    public String get(String name) {
        String value = configuration.getProperty(name);
        if (value == null) {
            logger.error("Property {} = null", name);
        }
        return value;
    }
    
    public int getInt(String name) {
        return Integer.valueOf(get(name));
    }
}

@@ -2292,11 +2292,15 @@
 lic 
-i
+I
 nt
+eger
  get
@@ -2310,32 +2310,100 @@
 (String name) %7B%0A
+        if (get(name) == null) %7B%0A            return null;%0A        %7D%0A
         return I

Make Configuration.getInt() null safe.