Remove ObserveRelation also on early cancel.

Fix javadoc. Signed-off-by: Achim Kraus <achim.kraus@cloudcoap.net>
eclipse-californium · Mar 3, 2024 · 7e35e62 · 7e35e62
1 parent 7ef56fe
commit 7e35e62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/californium-core/src/main/java/org/eclipse/californium/core/observe/ObserveManager.java b/californium-core/src/main/java/org/eclipse/californium/core/observe/ObserveManager.java
@@ -51,7 +51,7 @@ public class ObserveManager {
 	/** The mapping from endpoint addresses to ObservingEndpoints */
 	private final ConcurrentHashMap<InetSocketAddress, ObservingEndpoint> endpoints;
 	/**
-	 * The mapping from endpoint addresses to ObservingEndpoints.
+	 * The mapping from token/endpoint address pairs to ObserveRelations.
 	 * 
 	 * @since 3.6
 	 */

diff --git a/californium-core/src/main/java/org/eclipse/californium/core/observe/ObserveRelation.java b/californium-core/src/main/java/org/eclipse/californium/core/observe/ObserveRelation.java
@@ -425,7 +425,8 @@ public State onResponse(Response response) {
 			return State.ESTABILSHED;
 		} else {
 			boolean established = false;
-			if (response.isSuccess()) {
+			boolean add = response.isSuccess();
+			if (add) {
 				setEstablished();
 				resource.addObserveRelation(this);
 				established = !isCanceled();
@@ -436,6 +437,9 @@ public State onResponse(Response response) {
 				}
 				return State.INIT;
 			} else {
+				if (add) {
+					resource.removeObserveRelation(this);
+				}
 				return State.CANCELED;
 			}
 		}