"dual-client" mode is mutually exclusive with HEART mode, HEART mode takes precedence

pull/1046/head
Justin Richer 2016-02-24 13:08:40 -05:00
parent 51e3513307
commit fa4ed7ea06
1 changed files with 6 additions and 2 deletions

View File

@ -201,8 +201,12 @@ public class ConfigurationPropertiesBean {
* @return true if dual client is configured, otherwise false * @return true if dual client is configured, otherwise false
*/ */
public boolean isDualClient() { public boolean isDualClient() {
if (isHeartMode()) {
return false; // HEART mode is incompatible with dual client mode
} else {
return dualClient; return dualClient;
} }
}
/** /**
* @param dualClient the dual client configuration * @param dualClient the dual client configuration
@ -212,7 +216,7 @@ public class ConfigurationPropertiesBean {
} }
/** /**
* Get the list of namespaces as a JSON string * Get the list of namespaces as a JSON string, for injection into the JavaScript UI
* @return * @return
*/ */
public String getLanguageNamespacesString() { public String getLanguageNamespacesString() {