From d807d5aaa40f39a7f76ce7d98f9e7845886d9cbe Mon Sep 17 00:00:00 2001
From: jerray <jawher.jerray@eurecom.fr>
Date: Tue, 27 Feb 2024 19:13:25 +0100
Subject: [PATCH] Minor update in handling confidentiality in AD
---
.../tmltranslator/toavatarsec/TML2Avatar.java | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java b/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
index 36a905a06c..02d0f1e813 100644
--- a/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
@@ -1456,22 +1456,22 @@ public class TML2Avatar {
Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
secChannelMap.put(ch, tmp);
}
+ if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
+ Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
+ wrPragmaMap.put((TMLWriteChannel) ae, tmp);
+ }
boolean isAvSecretInSet = false;
for (AvatarPragma av : secChannelMap.get(ch)) {
if (av.getName().equals(avPragmaSecret.getName())) {
isAvSecretInSet = true;
+ wrPragmaMap.get((TMLWriteChannel) ae).add(av);
break;
}
}
if (!isAvSecretInSet) {
secChannelMap.get(ch).add(avPragmaSecret);
+ wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
}
-
- if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
- Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
- wrPragmaMap.put((TMLWriteChannel) ae, tmp);
- }
- wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
}
}
}
@@ -1485,22 +1485,22 @@ public class TML2Avatar {
Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
secChannelMap.put(ch, tmp);
}
+ if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
+ Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
+ wrPragmaMap.put((TMLWriteChannel) ae, tmp);
+ }
boolean isAvSecretInSet = false;
for (AvatarPragma av : secChannelMap.get(ch)) {
if (av.getName().equals(avPragmaSecret.getName())) {
isAvSecretInSet = true;
+ wrPragmaMap.get((TMLWriteChannel) ae).add(av);
break;
}
}
if (!isAvSecretInSet) {
secChannelMap.get(ch).add(avPragmaSecret);
+ wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
}
-
- if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
- Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
- wrPragmaMap.put((TMLWriteChannel) ae, tmp);
- }
- wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
}
}
}
--
GitLab