--- old/modules/fxpackager/src/main/native/library/common/Exports.cpp	2015-03-30 15:11:12.000000000 -0600
+++ new/modules/fxpackager/src/main/native/library/common/Exports.cpp	2015-03-30 15:11:12.000000000 -0600
@@ -46,20 +46,22 @@
     // This is not a class to create an instance of.
     UserJVMArgsExports();
 
-    static jobjectArray MapKeysToJObjectArray(JNIEnv *env, TOrderedMap map) {
-        JavaStringArray result(env, map.size());
-        unsigned int index = 0;
-
-        for (TOrderedMap::iterator iterator = map.begin();
-            iterator != map.end();
-            iterator++) {
+    static jobjectArray MapKeysToJObjectArray(JNIEnv *env, OrderedMap<TString, TString> map) {
+        std::vector<TString> keys = map.GetKeys();
+        JavaStringArray result(env, keys.size());
 
-            jstring item = PlatformString(iterator->first).toJString(env);
+        for (unsigned int index = 0; index < keys.size(); index++) {
+            jstring item = PlatformString(keys[index]).toJString(env);
             result.SetValue(index, item);
-
-            index++;
         }
 
+//        JavaStringArray result(env, map.Count());
+//
+//        for (map::  iterator = map.begin(); iterator != map.end(); iterator++) {
+//            jstring item = PlatformString(keys[index]).toJString(env);
+//            result.SetValue(index, item);
+//        }
+
         return result.GetData();
     }
 
@@ -68,18 +70,19 @@
         if (env == NULL || option == NULL)
             return NULL;
 
-        jstring result;
+        jstring result = NULL;
 
         Package& package = Package::GetInstance();
-        TOrderedMap defaultuserargs = package.GetDefaultJVMUserArgs();
+        OrderedMap<TString, TString> defaultuserargs = package.GetDefaultJVMUserArgs();
         TString loption = PlatformString(env, option).toString();
-        PlatformString value = defaultuserargs[loption].value;
 
         try {
+            TString temp;
+            defaultuserargs.GetValue(loption, temp);
+            PlatformString value = temp;
             result = value.toJString(env);
         }
         catch (const JavaException&) {
-            return NULL;
         }
 
         return result;
@@ -89,7 +92,7 @@
         if (env == NULL)
             return NULL;
 
-        jobjectArray result;
+        jobjectArray result = NULL;
 
         Package& package = Package::GetInstance();
 
@@ -97,7 +100,6 @@
             result = MapKeysToJObjectArray(env, package.GetDefaultJVMUserArgs());
         }
         catch (const JavaException&) {
-            return NULL;
         }
 
         return result;
@@ -107,18 +109,19 @@
         if (env == NULL || option == NULL)
             return NULL;
 
-        jstring result;
+        jstring result = NULL;
 
         Package& package = Package::GetInstance();
-        TOrderedMap userargs = package.GetJVMUserArgs();
+        OrderedMap<TString, TString> userargs = package.GetJVMUserArgs();
 
         try {
             TString loption = PlatformString(env, option).toString();
-            PlatformString value = userargs[loption].value;
+            TString temp;
+            userargs.GetValue(loption, temp);
+            PlatformString value = temp;
             result = value.toJString(env);
         }
         catch (const JavaException&) {
-            return NULL;
         }
 
         return result;
@@ -127,9 +130,9 @@
     static void _setUserJvmKeysAndValues(JNIEnv *env, jobjectArray options, jobjectArray values) {
         if (env == NULL || options == NULL || values == NULL)
             return;
-        
+
         Package& package = Package::GetInstance();
-        TOrderedMap newMap;
+        OrderedMap<TString, TString> newMap;
 
         try {
             JavaStringArray loptions(env, options);
@@ -137,10 +140,8 @@
 
             for (unsigned int index = 0; index < loptions.Count(); index++) {
                 TString name = PlatformString(env, loptions.GetValue(index)).toString();
-                TValueIndex value;
-                value.value = PlatformString(env, lvalues.GetValue(index)).toString();
-                value.index = index;
-                newMap.insert(TOrderedMap::value_type(name, value));
+                TString value = PlatformString(env, lvalues.GetValue(index)).toString();
+                newMap.Append(name, value);
             }
         }
         catch (const JavaException&) {
@@ -154,7 +155,7 @@
         if (env == NULL)
             return NULL;
 
-        jobjectArray result;
+        jobjectArray result = NULL;
 
         Package& package = Package::GetInstance();
 
@@ -162,7 +163,6 @@
             result = MapKeysToJObjectArray(env, package.GetJVMUserArgs());
         }
         catch (const JavaException&) {
-            return NULL;
         }
 
         return result;
@@ -228,12 +228,12 @@
     JNIEXPORT jboolean JNICALL Java_com_DebugExports_isdebugged(JNIEnv *env, jclass klass) {
         jboolean result = false;
         Package& package = Package::GetInstance();
-        
+
         if (package.Debugging() == dsNative) {
             Platform& platform = Platform::GetInstance();
             result = platform.GetDebugState() != dsNone;
         }
-        
+
         return result;
     }