Better fix for ICE-5036 - Ice metrics test failure

1 files changed, 12 insertions, 5 deletions

diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/Ice/metrics/AllTests.java
index 9d283110e1b..90ba81c10ca 100644
--- a/java/test/Ice/metrics/AllTests.java
+++ b/java/test/Ice/metrics/AllTests.java
@@ -692,15 +692,19 @@ public class AllTests
 
         prx.ice_getConnection().close(false);
 
-        String exceptionName = null;
+        boolean dnsException = false;
         try
         {
             communicator.stringToProxy("test:tcp -p 12010 -h unknownfoo.zeroc.com").ice_ping();
             test(false);
         }
+        catch(Ice.DNSException ex)
+        {
+            dnsException = true;
+        }
         catch(Ice.LocalException ex)
         {
-            exceptionName = ex.ice_name();
+            // Some DNS servers don't fail on unknown DNS names.
         }
         test(clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup").length == 2);
         m1 = clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup")[0];
@@ -708,9 +712,12 @@ public class AllTests
         {
             m1 = clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup")[1];
         }
-        test(m1.id.equals("tcp -h unknownfoo.zeroc.com -p 12010") && m1.total == 2 && m1.failures == 2);
-    
-        checkFailure(clientMetrics, "EndpointLookup", m1.id, exceptionName, 2, out);
+        test(m1.id.equals("tcp -h unknownfoo.zeroc.com -p 12010") && m1.total == 2 && 
+             (!dnsException || m1.failures == 2));
+        if(dnsException)
+        {
+            checkFailure(clientMetrics, "EndpointLookup", m1.id, "Ice::DNSException", 2, out);
+        }
 
         c = new Connect(prx);