From 6534db8ed2932931578be9cc52277657c2242f7d Mon Sep 17 00:00:00 2001
From: Jan Christoph Bernack <jc.bernack@gmail.com>
Date: Fri, 13 May 2022 14:54:50 +0200
Subject: [PATCH] add fallback for piggybackTimeout of zero

---
 .../server/transport/coap/CoapTransportResource.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
index 983aec497c..0016cc05d8 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
@@ -355,7 +355,11 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
      * Essentially this allows the use of piggybacked responses.
      */
     private void deferAccept(CoapExchange exchange) {
-        transportContext.getScheduler().schedule(exchange::accept, piggybackTimeout, TimeUnit.MILLISECONDS);
+        if (piggybackTimeout > 0) {
+            transportContext.getScheduler().schedule(exchange::accept, piggybackTimeout, TimeUnit.MILLISECONDS);
+        } else {
+            exchange.accept();
+        }
     }
 
     private UUID toSessionId(TransportProtos.SessionInfoProto sessionInfoProto) {