Fixed ICE-7930 - python Ice/location failure

2 files changed, 9 insertions, 3 deletions

diff --git a/objective-c/test/Ice/location/TestI.h b/objective-c/test/Ice/location/TestI.h
index 172e0024ded..2fbfa11cb9d 100644
--- a/objective-c/test/Ice/location/TestI.h
+++ b/objective-c/test/Ice/location/TestI.h
@@ -15,9 +15,9 @@
     NSMutableArray* communicators_;
     ServerLocatorRegistry* registry_;
     ICEInitializationData* initData_;
+    int nextPort_;
 }
 -(id)init:(ServerLocatorRegistry*)registry initData:(ICEInitializationData*)d;
-
 -(void)terminate;
 @end
 
diff --git a/objective-c/test/Ice/location/TestI.m b/objective-c/test/Ice/location/TestI.m
index 5318af11eed..267f9b4eee0 100644
--- a/objective-c/test/Ice/location/TestI.m
+++ b/objective-c/test/Ice/location/TestI.m
@@ -20,12 +20,11 @@
     }
     registry_ = registry;
     initData_ = initData;
+    nextPort_ = 1;
 
-    [initData_.properties setProperty:@"TestAdapter.Endpoints" value:@"default"];
     [initData_.properties setProperty:@"TestAdapter.AdapterId" value:@"TestAdapter"];
     [initData_.properties setProperty:@"TestAdapter.ReplicaGroupId" value:@"ReplicatedAdapter"];
 
-    [initData_.properties setProperty:@"TestAdapter2.Endpoints" value:@"default"];
     [initData_.properties setProperty:@"TestAdapter2.AdapterId" value:@"TestAdapter2"];
 
     [initData_.properties setProperty:@"Ice.PrintAdapterReady" value:@"0"];
@@ -40,6 +39,10 @@
 }
 #endif
 
+-(NSString*) getTestEndpoint:(int)port
+{
+    return [NSString stringWithFormat:@"default -p %d", 12010 + port];
+}
 -(void) startServer:(ICECurrent*)current
 {
     for(id<ICECommunicator> c in communicators_)
@@ -62,6 +65,9 @@
     id<ICECommunicator> serverCommunicator = [ICEUtil createCommunicator:initData_];
     [communicators_ addObject:serverCommunicator];
 
+    [[serverCommunicator getProperties] setProperty:@"TestAdapter.Endpoints" value:[self getTestEndpoint:nextPort_++]];
+    [[serverCommunicator getProperties] setProperty:@"TestAdapter2.Endpoints" value:[self getTestEndpoint:nextPort_++]];
+
     id<ICEObjectAdapter> adapter = [serverCommunicator createObjectAdapter:@"TestAdapter"];
     id<ICEObjectAdapter> adapter2 = [serverCommunicator createObjectAdapter:@"TestAdapter2"];