Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Minor protocol updates

Rich Turner3b40c817b524
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
index 1f722b1f7..c65df8a1e 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
@@ -288,9 +288,6 @@ public class HttpClientProtocol extends AbstractProtocol {
}
}
- /**
- * Used to
- */
protected static class PagingResponse extends BuiltResponse {
private PagingResponse(int status, Headers<Object> metadata, Object entity, Annotation[] entityAnnotations) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/AbstractTcpServerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/AbstractTcpServerProtocol.java
index 20fe251aa..d7696cd4e 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/AbstractTcpServerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/AbstractTcpServerProtocol.java
@@ -71,6 +71,11 @@ public abstract class AbstractTcpServerProtocol<T extends AbstractTcpServer<U>,
protected void doLinkProtocolConfiguration(AssetAttribute protocolConfiguration) {
final AttributeRef protocolRef = protocolConfiguration.getReferenceOrThrow();
+ if (!protocolConfiguration.isEnabled()) {
+ LOG.info("Protocol configuration is disabled so ignoring: " + protocolConfiguration.getReferenceOrThrow());
+ return;
+ }
+
int port = protocolConfiguration.getMetaItem(META_PROTOCOL_BIND_PORT)
.flatMap(AbstractValueHolder::getValueAsInteger)
.orElseThrow(() ->