Author: gsingers
Date: Mon Feb 18 17:42:22 2008
New Revision: 628955
URL: http://svn.apache.org/viewvc?rev=628955&view=rev
Log:
SOLR-481: Handle UnknownHostException
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/webapp/resources/admin/_info.jsp
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=628955&r1=628954&r2=628955&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Feb 18 17:42:22 2008
@@ -253,6 +253,8 @@
16. SOLR-42: HTMLStripReader tokenizers now preserve correct source
offsets for highlighting. (Grant Ingersoll via yonik)
+17. SOLR-481: Handle UnknownHostException in _info.jsp (gsingers)
+
Other Changes
1. SOLR-135: Moved common classes to org.apache.solr.common and altered the
build scripts to make two jars: apache-solr-1.3.jar and
Modified: lucene/solr/trunk/src/webapp/resources/admin/_info.jsp
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/resources/admin/_info.jsp?rev=628955&r1=628954&r2=628955&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/resources/admin/_info.jsp (original)
+++ lucene/solr/trunk/src/webapp/resources/admin/_info.jsp Mon Feb 18 17:42:22
2008
@@ -23,6 +23,7 @@
<%@ page import="org.apache.solr.core.Config"%>
<%@ page import="org.apache.solr.util.XML"%>
<%@ page import="org.apache.lucene.LucenePackage"%>
+<%@ page import="java.net.UnknownHostException" %>
<%
@@ -46,8 +47,14 @@
}
String collectionName = schema!=null ? schema.getName():"unknown";
- InetAddress addr = InetAddress.getLocalHost();
- String hostname = addr.getCanonicalHostName();
+ InetAddress addr = null;
+ String hostname = "unknown";
+ try {
+ addr = InetAddress.getLocalHost();
+ hostname = addr.getCanonicalHostName();
+ } catch (UnknownHostException e) {
+ //default to unknown
+ }
String defaultSearch = "";
{
