You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/08/19 21:11:54 UTC
svn commit: r1618939 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/core/RunExecutableListener.java
solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Author: uschindler
Date: Tue Aug 19 19:11:53 2014
New Revision: 1618939
URL: http://svn.apache.org/r1618939
Log:
Merged revision(s) 1618938 from lucene/dev/trunk:
SOLR-6387: Try to fix this a second time...
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java?rev=1618939&r1=1618938&r2=1618939&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java Tue Aug 19 19:11:53 2014
@@ -83,7 +83,7 @@ class RunExecutableListener extends Abst
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;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1618939&r1=1618938&r2=1618939&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Tue Aug 19 19:11:53 2014
@@ -225,7 +225,7 @@ public class SystemInfoHandler extends R
// 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 + ")";
}