From 3ea8440652fe78b53a349fa023865054a1148390 Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Fri, 19 Dec 2008 06:37:28 +0000
Subject: [PATCH] SOLR-918 follow up -- Remove synchronization when iterating
 over infoRegistry and update Javadocs

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@727944 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/solr/core/SolrCore.java   |  4 ++
 .../solr/handler/admin/PluginInfoHandler.java | 54 +++++++++----------
 src/webapp/web/admin/stats.jsp                |  2 -
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/java/org/apache/solr/core/SolrCore.java b/src/java/org/apache/solr/core/SolrCore.java
index b72a425f7b3..e606862abd6 100644
--- a/src/java/org/apache/solr/core/SolrCore.java
+++ b/src/java/org/apache/solr/core/SolrCore.java
@@ -238,6 +238,10 @@ public final class SolrCore implements SolrInfoMBean {
   }
 
   /**
+   * Returns a Map of name vs SolrInfoMBean objects. The returned map is an instance of
+   * a ConcurrentHashMap and therefore no synchronization is needed for putting, removing
+   * or iterating over it.
+   *
    * @return the Info Registry map which contains SolrInfoMBean objects keyed by name
    * @since solr 1.3
    */
diff --git a/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
index 3e68899f975..b40f2b81e46 100644
--- a/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
+++ b/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
@@ -59,36 +59,34 @@ public class PluginInfoHandler extends RequestHandlerBase
       SimpleOrderedMap<Object> category = new SimpleOrderedMap<Object>();
       list.add( cat.name(), category );
       Map<String, SolrInfoMBean> reg = core.getInfoRegistry();
-      synchronized(reg) {
-        for (Map.Entry<String,SolrInfoMBean> entry : reg.entrySet()) {
-          SolrInfoMBean m = entry.getValue();
-          if (m.getCategory() != cat) continue;
-      
-          String na = "Not Declared";
-          SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
-          category.add( entry.getKey(), info );
-          
-          info.add( "name",        (m.getName()       !=null ? m.getName()        : na) );
-          info.add( "version",     (m.getVersion()    !=null ? m.getVersion()     : na) );
-          info.add( "description", (m.getDescription()!=null ? m.getDescription() : na) );
-          
-          info.add( "sourceId",    (m.getSourceId()   !=null ? m.getSourceId()    : na) );
-          info.add( "source",      (m.getSource()     !=null ? m.getSource()      : na) );
-        
-          URL[] urls = m.getDocs();
-          if ((urls != null) && (urls.length > 0)) {
-            ArrayList<String> docs = new ArrayList<String>(urls.length);
-            for( URL u : urls ) {
-              docs.add( u.toExternalForm() );
-            }
-            info.add( "docs", docs );
-          }
-        
-          if( stats ) {
-            info.add( "stats", m.getStatistics() );
+      for (Map.Entry<String,SolrInfoMBean> entry : reg.entrySet()) {
+        SolrInfoMBean m = entry.getValue();
+        if (m.getCategory() != cat) continue;
+
+        String na = "Not Declared";
+        SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+        category.add( entry.getKey(), info );
+
+        info.add( "name",        (m.getName()       !=null ? m.getName()        : na) );
+        info.add( "version",     (m.getVersion()    !=null ? m.getVersion()     : na) );
+        info.add( "description", (m.getDescription()!=null ? m.getDescription() : na) );
+
+        info.add( "sourceId",    (m.getSourceId()   !=null ? m.getSourceId()    : na) );
+        info.add( "source",      (m.getSource()     !=null ? m.getSource()      : na) );
+
+        URL[] urls = m.getDocs();
+        if ((urls != null) && (urls.length > 0)) {
+          ArrayList<String> docs = new ArrayList<String>(urls.length);
+          for( URL u : urls ) {
+            docs.add( u.toExternalForm() );
           }
+          info.add( "docs", docs );
         }
-      }  
+
+        if( stats ) {
+          info.add( "stats", m.getStatistics() );
+        }
+      }
     }
     return list;
   }
diff --git a/src/webapp/web/admin/stats.jsp b/src/webapp/web/admin/stats.jsp
index 7e0f7b9cd89..9ce23281691 100644
--- a/src/webapp/web/admin/stats.jsp
+++ b/src/webapp/web/admin/stats.jsp
@@ -40,7 +40,6 @@ for (SolrInfoMBean.Category cat : SolrInfoMBean.Category.values()) {
     <<%= cat.toString() %>>
 <%
  Map<String,SolrInfoMBean> reg = core.getInfoRegistry();
- synchronized(reg) {
   for (Map.Entry<String,SolrInfoMBean> entry : reg.entrySet()) {
     String key = entry.getKey();
     SolrInfoMBean m = entry.getValue();
@@ -84,7 +83,6 @@ for (SolrInfoMBean.Category cat : SolrInfoMBean.Category.values()) {
 %>
 <%
   }
- }
 %>
     </<%= cat.toString() %>>
 <%