Author: hossman
Date: Fri May 5 19:12:13 2006
New Revision: 400225
URL: http://svn.apache.org/viewcvs?rev=400225&view=rev
Log:
fixed NPE on log level changing when helthcheck isn't in use
Modified:
incubator/solr/trunk/src/webapp/resources/admin/action.jsp
Modified: incubator/solr/trunk/src/webapp/resources/admin/action.jsp
URL:
http://svn.apache.org/viewcvs/incubator/solr/trunk/src/webapp/resources/admin/action.jsp?rev=400225&r1=400224&r2=400225&view=diff
==============================================================================
--- incubator/solr/trunk/src/webapp/resources/admin/action.jsp (original)
+++ incubator/solr/trunk/src/webapp/resources/admin/action.jsp Fri May 5
19:12:13 2006
@@ -14,8 +14,6 @@
String enableActionStatus = "";
boolean isValid = false;
- File enableFile = new File(enabledFile);
-
if (action != null) {
// Validate fname
if ("Enable".compareTo(action) == 0) isValid = true;
@@ -28,6 +26,7 @@
if (isValid) {
if ("Enable".compareTo(action) == 0) {
try {
+ File enableFile = new File(enabledFile);
if (enableFile.createNewFile()) {
enableActionStatus += "Enable Succeeded (enable file ";
enableActionStatus += enabledFile;
@@ -41,6 +40,7 @@
}
if ("Disable".compareTo(action) == 0) {
try {
+ File enableFile = new File(enabledFile);
if (enableFile.delete()) {
enableActionStatus = "Disable Succeeded (enable file ";
enableActionStatus += enabledFile;
@@ -70,7 +70,8 @@
} else {
enableActionStatus = "Illegal Action";
}
-
+ // :TODO: might want to rework this so any logging change happens *after*
+ SolrCore.log.log(Level.INFO, enableActionStatus);
%>
<br clear="all">
<table>
