Refactored test scripts

2 files changed, 15 insertions, 8 deletions

diff --git a/objective-c/src/Ice/ConnectionI.mm b/objective-c/src/Ice/ConnectionI.mm
index 5dc6a0ff89b..09ee73c982f 100644
--- a/objective-c/src/Ice/ConnectionI.mm
+++ b/objective-c/src/Ice/ConnectionI.mm
@@ -77,12 +77,16 @@ registerConnectionInfoClass(Class cl)
         return [[ICETCPConnectionInfo alloc] initWithTCPConnectionInfo:tcpInfo.get()];
     }
 
-    for(std::vector<Class>::const_iterator p = connectionInfoClasses->begin(); p != connectionInfoClasses->end(); ++p)
+    if(connectionInfoClasses)
     {
-        ICEConnectionInfo* r = [*p checkedConnectionInfoWithConnectionInfo:info];
-        if(r)
+        for(std::vector<Class>::const_iterator p = connectionInfoClasses->begin(); p != connectionInfoClasses->end();
+            ++p)
         {
-            return r;
+            ICEConnectionInfo* r = [*p checkedConnectionInfoWithConnectionInfo:info];
+            if(r)
+            {
+                return r;
+            }
         }
     }
 
diff --git a/objective-c/src/Ice/EndpointI.mm b/objective-c/src/Ice/EndpointI.mm
index 757a19a266c..35fd9af59cc 100644
--- a/objective-c/src/Ice/EndpointI.mm
+++ b/objective-c/src/Ice/EndpointI.mm
@@ -83,12 +83,15 @@ registerEndpointInfoClass(Class cl)
         return [[ICEOpaqueEndpointInfo alloc] initWithOpaqueEndpointInfo:opaqueInfo.get()];
     }
 
-    for(std::vector<Class>::const_iterator p = endpointInfoClasses->begin(); p != endpointInfoClasses->end(); ++p)
+    if(endpointInfoClasses)
     {
-        ICEEndpointInfo* r = [*p checkedEndpointInfoWithEndpointInfo:info];
-        if(r)
+        for(std::vector<Class>::const_iterator p = endpointInfoClasses->begin(); p != endpointInfoClasses->end(); ++p)
         {
-            return r;
+            ICEEndpointInfo* r = [*p checkedEndpointInfoWithEndpointInfo:info];
+            if(r)
+            {
+                return r;
+            }
         }
     }