Browse code

BM-14984 Fix: fix fai container uid

Thomas Fricker authored on 25/06/2019 14:19:11
Showing 1 changed files
... ...
@@ -47,11 +47,11 @@ import net.bluemind.core.api.ParametersValidator;
47 47
 import net.bluemind.core.api.Regex;
48 48
 import net.bluemind.core.api.fault.ErrorCode;
49 49
 import net.bluemind.core.api.fault.ServerFault;
50
-import net.bluemind.core.container.api.IFlatHierarchyUids;
51 50
 import net.bluemind.core.container.api.IContainersFlatHierarchy;
52 51
 import net.bluemind.core.container.api.IDataShardSupport;
53
-import net.bluemind.core.container.api.IOwnerSubscriptions;
52
+import net.bluemind.core.container.api.IFlatHierarchyUids;
54 53
 import net.bluemind.core.container.api.IOwnerSubscriptionUids;
54
+import net.bluemind.core.container.api.IOwnerSubscriptions;
55 55
 import net.bluemind.core.container.model.Container;
56 56
 import net.bluemind.core.container.model.ContainerChangelog;
57 57
 import net.bluemind.core.container.model.ContainerChangeset;
... ...
@@ -369,18 +369,16 @@ public class Directory {
369 369
 		});
370 370
 
371 371
 		xferContainer(monitor.subWork(1), dirEntry, serverUid, "mapi_fai", (String containerUid) -> {
372
-			return sp.instance(IMapiFolderAssociatedInformation.class, containerUid);
372
+			return sp.instance(IMapiFolderAssociatedInformation.class, containerUid.substring("mapi_fai_".length()));
373 373
 		});
374 374
 
375
-		xferContainer(monitor.subWork(1), dirEntry, serverUid, IFlatHierarchyUids.TYPE,
376
-				(String containerUid) -> {
377
-					return sp.instance(IContainersFlatHierarchy.class, domainUid, entryUid);
378
-				});
375
+		xferContainer(monitor.subWork(1), dirEntry, serverUid, IFlatHierarchyUids.TYPE, (String containerUid) -> {
376
+			return sp.instance(IContainersFlatHierarchy.class, domainUid, entryUid);
377
+		});
379 378
 
380
-		xferContainer(monitor.subWork(1), dirEntry, serverUid, IOwnerSubscriptionUids.TYPE,
381
-				(String containerUid) -> {
382
-					return sp.instance(IOwnerSubscriptions.class, domainUid, entryUid);
383
-				});
379
+		xferContainer(monitor.subWork(1), dirEntry, serverUid, IOwnerSubscriptionUids.TYPE, (String containerUid) -> {
380
+			return sp.instance(IOwnerSubscriptions.class, domainUid, entryUid);
381
+		});
384 382
 
385 383
 		ItemValue<Mailbox> mailbox = sp.instance(IMailboxes.class, domainUid).getComplete(entryUid);
386 384