Browse Source

fix for MqttSslHandlerProvider component injection & fix for skip_check_client_certificate parameter injection

pull/4840/head
ShvaykaD 5 years ago
committed by Andrew Shvayka
parent
commit
d6bbeae335
  1. 1
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
  2. 2
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java

1
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java

@ -55,7 +55,6 @@ import java.util.concurrent.TimeUnit;
*/ */
@Slf4j @Slf4j
@Component("MqttSslHandlerProvider") @Component("MqttSslHandlerProvider")
@ConditionalOnExpression("'${transport.mqtt.enabled}'=='true'")
@ConditionalOnProperty(prefix = "transport.mqtt.ssl", value = "enabled", havingValue = "true", matchIfMissing = false) @ConditionalOnProperty(prefix = "transport.mqtt.ssl", value = "enabled", havingValue = "true", matchIfMissing = false)
public class MqttSslHandlerProvider { public class MqttSslHandlerProvider {

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java

@ -52,7 +52,7 @@ public class MqttTransportContext extends TransportContext {
private Integer maxPayloadSize; private Integer maxPayloadSize;
@Getter @Getter
@Value("${transport.mqtt.netty.skip_validity_check_for_client_cert:false}") @Value("${transport.mqtt.ssl.skip_validity_check_for_client_cert:false}")
private boolean skipValidityCheckForClientCert; private boolean skipValidityCheckForClientCert;
@Getter @Getter

Loading…
Cancel
Save