handle not set session identifiers in case of failed handshake

Dickaa88 · Oct 5, 2012 · f7fb32a · f7fb32a
1 parent a1e9774
commit f7fb32a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/californium/src/main/java/ch/ethz/inf/vs/californium/layers/DTLSLayer.java b/californium/src/main/java/ch/ethz/inf/vs/californium/layers/DTLSLayer.java
@@ -464,13 +464,17 @@ private DTLSSession getSessionByIdentifier(byte[] sessionID) {
 		if (sessionID == null) {
 			return null;
 		}
+
 		for (Entry<String, DTLSSession> entry : dtlsSessions.entrySet()) {
-			byte[] id = entry.getValue().getSessionIdentifier().getSessionId();
-			if (id == null) {
-				return null;
-			}
-			if (Arrays.equals(sessionID, id)) {
-				return entry.getValue();
+			// FIXME session identifiers may not be set, when the handshake failed after the initial message
+			// these sessions must be deleted when this happens
+			try {
+				byte[] id = entry.getValue().getSessionIdentifier().getSessionId();
+				if (Arrays.equals(sessionID, id)) {
+					return entry.getValue();
+				}
+			} catch (Exception e) {
+				continue;
 			}
 		}