Merge pull request #332 from ayyoob/com

fixing commit issues
revert-70aa11f8
Ruwan 8 years ago committed by GitHub
commit 6134f94e3c

@ -41,16 +41,13 @@ import java.util.List;
public class Profiles {
@XmlElement(name = "Profile")
protected List<String> profile;
protected List<String> profile = new ArrayList<String>();;
/**
* Gets the value of the profile property.
*
*/
public List<String> getProfile() {
if (profile == null) {
profile = new ArrayList<String>();
}
return this.profile;
}

@ -81,7 +81,7 @@ public class JWTClientManagerServiceImpl implements JWTClientManagerService {
addJWTClient(tenantDomain, jwtClient);
} catch (JWTClientAlreadyExistsException e) {
log.warn("Attempting to register a jwt client for the tenant " + tenantDomain +
" when one already exists. Returning existing jwt client");
" when one already exists. Returning existing jwt client", e);
return getJWTClient(tenantDomain);
} catch (JWTClientConfigurationException e) {
throw new JWTClientException("Failed to parse jwt configuration for tenant " + tenantDomain, e);
@ -110,7 +110,7 @@ public class JWTClientManagerServiceImpl implements JWTClientManagerService {
addJWTClient(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME, defaultJWTClient);
} catch (JWTClientAlreadyExistsException e) {
log.warn("Attempting to register a jwt client for the super tenant" +
" when one already exists. Returning existing jwt client");
" when one already exists. Returning existing jwt client", e);
}
}
}

Loading…
Cancel
Save