From 04484c215c58a87e7c5a9efbcc7a074bc021ca41 Mon Sep 17 00:00:00 2001 From: Achim Kraus Date: Fri, 11 Mar 2022 10:03:10 +0100 Subject: [PATCH] Remove block1 in error response. Fixes: issue #1937 Signed-off-by: Achim Kraus --- .../eclipse/californium/core/network/stack/BlockwiseLayer.java | 2 -- .../californium/core/test/lockstep/BlockwiseServerSideTest.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/californium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java b/californium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java index c3d3628fc0..f2860ac49f 100644 --- a/californium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java +++ b/californium-core/src/main/java/org/eclipse/californium/core/network/stack/BlockwiseLayer.java @@ -644,9 +644,7 @@ private void handleInboundBlockwiseUpload(final Exchange exchange, final Request private void sendBlock1ErrorResponse(Block1BlockwiseStatus status, Exchange exchange, Request request, ResponseCode errorCode, String message) { - BlockOption block1 = request.getOptions().getBlock1(); Response error = Response.createResponse(request, errorCode); - error.getOptions().setBlock1(block1.getSzx(), block1.isM(), block1.getNum()); error.setPayload(message); clearBlock1Status(status); lower().sendResponse(exchange, error); diff --git a/californium-core/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java b/californium-core/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java index 8f38445593..94ba427a63 100644 --- a/californium-core/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java +++ b/californium-core/src/test/java/org/eclipse/californium/core/test/lockstep/BlockwiseServerSideTest.java @@ -930,7 +930,7 @@ public void testRandomAccessPUTAttemp() throws Exception { Token tok = generateNextToken(); client.sendRequest(CON, PUT, tok, ++mid).path(RESOURCE_PATH).block1(2, true, 64).payload(reqtPayload.substring(2*64, 3*64)).go(); - client.expectResponse(ACK, REQUEST_ENTITY_INCOMPLETE, tok, mid).block1(2, true, 64).go(); + client.expectResponse(ACK, REQUEST_ENTITY_INCOMPLETE, tok, mid).go(); } @Test