Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

[core] throw AssertionError if SessionId is missing

Browse Source 
Also remove stale comment
This commit is contained in:
Torsten Grote
2019-10-09 08:27:33 -03:00
parent 9660ff2fff
commit e3e47dae48
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java
View File

@@ -583,9 +583,11 @@ class IntroductionManagerImpl extends ConversationClientImpl
throw new DbException(e); throw new DbException(e);
} }
if (m.getSessionId() == null) { if (m.getSessionId() == null) {
// this can only be an unhandled REQUEST message // This can only be an unhandled REQUEST message.
// that does not yet have a SessionId assigned // Its session is created and stored in incomingMessage(),
continue; // and getMessageMetadata() only returns delivered messages,
// so the session ID should have been assigned.
throw new AssertionError("missing session ID");
} }
// get session from map or database // get session from map or database
DeletableSession session = sessions.get(m.getSessionId()); DeletableSession session = sessions.get(m.getSessionId());

5
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -1349,11 +1349,6 @@ public class IntroductionIntegrationTest
assertFalse(deleteAllMessages0From2()); assertFalse(deleteAllMessages0From2());
} }
/**
* This test is testing that a session's deletable flag gets reset
* when the session is used again,
* so that it can not cause a session to get deleted prematurely.
*/
@Test @Test
public void testDeletingOneSideOfSession() throws Exception { public void testDeletingOneSideOfSession() throws Exception {
addListeners(false, false); addListeners(false, false);