Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6387: Try to fix this a second time... 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1618938 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2014-08-19 19:11:07 +00:00
parent b9cf600c56
commit ffeb6b029c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/core/RunExecutableListener.java
View File

@ -83,7 +83,7 @@ class RunExecutableListener extends AbstractSolrEventListener {
proc = Runtime.getRuntime().exec(cmd, envp ,dir);
} catch (Error err) {
// Create better error message
if (err.getMessage() != null && err.getMessage().contains("posix_spawn")) {
if (err.getMessage() != null && (err.getMessage().contains("posix_spawn") || err.getMessage().contains("UNIXProcess"))) {
Error newErr = new Error("Error forking command due to JVM locale bug (see https://issues.apache.org/jira/browse/SOLR-6387): " + err.getMessage());
newErr.setStackTrace(err.getStackTrace());
err = newErr;

2
solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
View File

@ -225,7 +225,7 @@ public class SystemInfoHandler extends RequestHandlerBase
// ignore - log.warn("Error executing command", ex);
return "(error executing: " + cmd + ")";
} catch (Error err) {
if (err.getMessage() != null && err.getMessage().contains("posix_spawn")) {
if (err.getMessage() != null && (err.getMessage().contains("posix_spawn") || err.getMessage().contains("UNIXProcess"))) {
log.warn("Error forking command due to JVM locale bug (see https://issues.apache.org/jira/browse/SOLR-6387): " + err.getMessage());
return "(error executing: " + cmd + ")";
}