equal
deleted
inserted
replaced
140 TString name; |
140 TString name; |
141 TString value; |
141 TString value; |
142 if (Helpers::SplitOptionIntoNameValue(argvalue, name, value)) { |
142 if (Helpers::SplitOptionIntoNameValue(argvalue, name, value)) { |
143 result.Append(name, value); |
143 result.Append(name, value); |
144 } |
144 } |
145 } |
|
146 } |
|
147 |
|
148 return result; |
|
149 } |
|
150 |
|
151 OrderedMap<TString, TString> |
|
152 Helpers::GetJVMUserArgsFromConfig(IPropertyContainer* config) { |
|
153 OrderedMap<TString, TString> result; |
|
154 |
|
155 for (unsigned int index = 0; index < config->GetCount(); index++) { |
|
156 TString prefix = TString(_T("jvmuserarg.")) |
|
157 + PlatformString(index + 1).toString(); |
|
158 TString argname = prefix + _T(".name"); |
|
159 TString argvalue = prefix + _T(".value"); |
|
160 TString name; |
|
161 TString value; |
|
162 |
|
163 if ((config->GetValue(argname, name) == false) || |
|
164 (config->GetValue(argvalue, value) == false)) { |
|
165 break; |
|
166 } |
|
167 else if ((name.empty() == false) && (value.empty() == false)) { |
|
168 result.Append(name, value); |
|
169 } |
145 } |
170 } |
146 } |
171 |
147 |
172 return result; |
148 return result; |
173 } |
149 } |
225 // JVMOptions Section |
201 // JVMOptions Section |
226 OrderedMap<TString, TString> JVMArgs = |
202 OrderedMap<TString, TString> JVMArgs = |
227 Helpers::GetJVMArgsFromConfig(&propertyFile); |
203 Helpers::GetJVMArgsFromConfig(&propertyFile); |
228 Container->AppendSection(keys[CONFIG_SECTION_JVMOPTIONS], JVMArgs); |
204 Container->AppendSection(keys[CONFIG_SECTION_JVMOPTIONS], JVMArgs); |
229 |
205 |
230 // JVMUserOptions Section |
|
231 OrderedMap<TString, TString> defaultJVMUserArgs = |
|
232 Helpers::GetJVMUserArgsFromConfig(&propertyFile); |
|
233 Container->AppendSection(keys[CONFIG_SECTION_JVMUSEROPTIONS], |
|
234 defaultJVMUserArgs); |
|
235 |
|
236 // ArgOptions Section |
206 // ArgOptions Section |
237 std::list<TString> args = Helpers::GetArgsFromConfig(&propertyFile); |
207 std::list<TString> args = Helpers::GetArgsFromConfig(&propertyFile); |
238 OrderedMap<TString, TString> convertedArgs; |
208 OrderedMap<TString, TString> convertedArgs; |
239 |
209 |
240 for (std::list<TString>::iterator iterator = args.begin(); |
210 for (std::list<TString>::iterator iterator = args.begin(); |