community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing few issues after testing

Browse Source
This commit is contained in:
ayyoob 2017-06-17 18:54:39 +05:30
parent 7117fdeafc
commit b14ddd609a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/output/adapter/mqtt/MQTTEventAdapterFactory.java
View File

@ -84,7 +84,7 @@ public class MQTTEventAdapterFactory extends OutputEventAdapterFactory {
clearSession.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION)); clearSession.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION));
clearSession.setRequired(false); clearSession.setRequired(false);
clearSession.setOptions(new String[]{"true", "false"}); clearSession.setOptions(new String[]{"true", "false"});
clearSession.setDefaultValue("true"); clearSession.setDefaultValue("false");
clearSession.setHint(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION_HINT)); clearSession.setHint(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_CONF_CLEAN_SESSION_HINT));
// set Quality of Service // set Quality of Service

2
components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
View File

@ -133,7 +133,7 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
return false; return false;
} catch (FeignException e) { } catch (FeignException e) {
oAuthRequestInterceptor.resetApiApplicationKey(); oAuthRequestInterceptor.resetApiApplicationKey();
if (e.getMessage().contains(GATEWAY_ERROR_CODE)) { if (e.getMessage().contains(GATEWAY_ERROR_CODE) || e.status() == 404) {
log.error("Failed to connect to the device authorization service."); log.error("Failed to connect to the device authorization service.");
} else { } else {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);

1
components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java
View File

@ -125,6 +125,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
public void resetApiApplicationKey() { public void resetApiApplicationKey() {
apiApplicationKey = null; apiApplicationKey = null;
tokenIssuerService = null;
} }
private static Client getSSLClient() { private static Client getSSLClient() {