svn commit: r533809 - /lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java

[ry...@apache.org]

Author: ryan
Date: Mon Apr 30 10:18:02 2007
New Revision: 533809

URL: http://svn.apache.org/viewvc?view=rev&rev=533809
Log:
Properties are maps, so they don't need special handling

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java?view=diff&rev=533809&r1=533808&r2=533809
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java Mon Apr 30 10:18:02 2007
@@ -36,27 +36,17 @@
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException 
   {
-    NamedList<String> props = null;
+    Object props = null;
     String name = req.getParams().get( "name" );
     if( name != null ) {
-      props = new SimpleOrderedMap<String>();
-      props.add( name, System.getProperty(name) );
+      NamedList<String> p = new SimpleOrderedMap<String>();
+      p.add( name, System.getProperty(name) );
+      props = p;
     }
     else {
-      props = toNamedList( System.getProperties() );
+      props = System.getProperties();
     }
     rsp.add( "system.properties", props );
-  }
-
-  public static NamedList<String> toNamedList( Properties p )
-  {
-    NamedList<String> props = new SimpleOrderedMap<String>();
-    java.util.Enumeration e = p.propertyNames();
-    while(e.hasMoreElements()) {
-      String prop = (String)e.nextElement();
-      props.add( prop, p.getProperty(prop) );
-    }
-    return props;
   }
   
   //////////////////////// SolrInfoMBeans methods //////////////////////