From ad7faf9b1a09bc5069049bb0de17399620a0059d Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Fri, 26 Mar 2010 13:42:27 +0000
Subject: [PATCH] made this test smarter

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@927848 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/solr/core/TestJmxMonitoredMap.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java b/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
index c2407732ea6..440958cf7dc 100644
--- a/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
+++ b/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
@@ -54,15 +54,20 @@ public class TestJmxMonitoredMap {
 
   @Before
   public void setUp() throws Exception {
-    for (int i = 0; i < 5; i++) {
+    int retries = 5;
+    for (int i = 0; i < retries; i++) {
       try {
         ServerSocket server = new ServerSocket(0);
-        port = server.getLocalPort();
-        server.close();
+        try {
+          port = server.getLocalPort();
+        } finally {
+          server.close();
+        }
         // System.out.println("Using port: " + port);
         try {
           LocateRegistry.createRegistry(port);
         } catch (RemoteException e) {
+          throw e;
         }
         String url = "service:jmx:rmi:///jndi/rmi://:" + port + "/solrjmx";
         JmxConfiguration config = new JmxConfiguration(true, null, url);
@@ -72,7 +77,9 @@ public class TestJmxMonitoredMap {
         mbeanServer = connector.getMBeanServerConnection();
         break;
       } catch (Exception e) {
-
+        if(retries == (i + 1)) {
+          throw e;
+        }
       }
     }
   }