You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/10 21:52:37 UTC
svn commit: r1466649 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Author: markrmiller
Date: Wed Apr 10 19:52:33 2013
New Revision: 1466649
URL: http://svn.apache.org/r1466649
Log:
SOLR-4699: The System admin handler should not assume a file system based data directory location.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1466649&r1=1466648&r2=1466649&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 10 19:52:33 2013
@@ -175,6 +175,8 @@ Bug Fixes
* SOLR-4581: When faceting on numeric fields in Solr 4.2, negative values (constraints)
were sorted incorrectly. (Alexander Buhr, shalin, yonik)
+* SOLR-4699: The System admin handler should not assume a file system based data directory
+ location. (Mark Miller)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1466649&r1=1466648&r2=1466649&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Apr 10 19:52:33 2013
@@ -106,7 +106,12 @@ public class SystemInfoHandler extends R
SimpleOrderedMap<Object> dirs = new SimpleOrderedMap<Object>();
dirs.add( "cwd" , new File( System.getProperty("user.dir")).getAbsolutePath() );
dirs.add( "instance", new File( core.getResourceLoader().getInstanceDir() ).getAbsolutePath() );
- dirs.add( "data", new File( core.getDataDir() ).getAbsolutePath() );
+ try {
+ dirs.add( "data", core.getDirectoryFactory().normalize(core.getDataDir()));
+ } catch (IOException e) {
+ log.warn("Problem getting the normalized data directory path", e);
+ dirs.add( "data", "N/A" );
+ }
dirs.add( "dirimpl", core.getDirectoryFactory().getClass().getName());
try {
dirs.add( "index", core.getDirectoryFactory().normalize(core.getIndexDir()) );