1 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index 82357d8..e0decc4 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -75,6 +75,10 @@ public class Gateway
     	
         // if supplied props are null, use system props
         if (props == null) props = System.getProperties();
+        
+        // Init properties
+        mC2KProps = new Properties();
+        mC2KProps.putAll(props);
 
         // report version info
         Logger.msg("Kernel version: "+Resource.getKernelVersion());
@@ -86,14 +90,7 @@ public class Gateway
 			Logger.error(e);
 			throw new InvalidDataException("Could not load module definitions.", "");
 		}
-        
-        // Start with default props from kernel jar
-        try {
-            mC2KProps = FileStringUtility.loadConfigFile( Resource.getKernelResourceURL("textFiles/defaultConf.properties").toString());
-        } catch (MalformedURLException ex) {
-            Logger.die("Default properties not found. Probable cause is missing resources");
-        }
-        
+
         // merge in module props
         Properties moduleProperties = mModules.getAllModuleProperties();
         for (Enumeration<?> e = moduleProperties.propertyNames(); e.hasMoreElements();) {
@@ -101,7 +98,7 @@ public class Gateway
             mC2KProps.put(propName, moduleProperties.get(propName));
         }
 
-        // Overwrite with supplied props
+        // Overwrite with argument props
         for (Enumeration<?> e = props.propertyNames(); e.hasMoreElements();) {
             String propName = (String)e.nextElement();
             mC2KProps.put(propName, props.get(propName));