community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #332 from ayyoob/com

Browse Source 
fixing commit issues
This commit is contained in:
Ruwan 2016-08-16 08:27:17 +05:30 committed by GitHub
commit 6134f94e3c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/config/Profiles.java
View File

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

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/FilteringUtil.java
View File

@ -32,7 +32,7 @@ public class FilteringUtil {
* This is used to filter from the cached policies. * This is used to filter from the cached policies.
*/ */
public static <T> List<T> getFilteredList(List<T> sourceList, int offset, int limit) { public static <T> List<T> getFilteredList(List<T> sourceList, int offset, int limit) {
if(sourceList == null || sourceList.size() < offset){ if (sourceList == null || sourceList.size() < offset) {
return Collections.emptyList(); return Collections.emptyList();
} }
return sourceList.subList(offset, Math.min(offset + limit, sourceList.size())); return sourceList.subList(offset, Math.min(offset + limit, sourceList.size()));

4
components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/service/JWTClientManagerServiceImpl.java
View File

@ -81,7 +81,7 @@ public class JWTClientManagerServiceImpl implements JWTClientManagerService {
addJWTClient(tenantDomain, jwtClient); addJWTClient(tenantDomain, jwtClient);
} catch (JWTClientAlreadyExistsException e) { } catch (JWTClientAlreadyExistsException e) {
log.warn("Attempting to register a jwt client for the tenant " + tenantDomain + 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); return getJWTClient(tenantDomain);
} catch (JWTClientConfigurationException e) { } catch (JWTClientConfigurationException e) {
throw new JWTClientException("Failed to parse jwt configuration for tenant " + tenantDomain, 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); addJWTClient(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME, defaultJWTClient);
} catch (JWTClientAlreadyExistsException e) { } catch (JWTClientAlreadyExistsException e) {
log.warn("Attempting to register a jwt client for the super tenant" + 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);
} }
} }
} }