summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2013-10-11 20:01:36 -0700
committerShawn Pearce <sop@google.com>2013-10-11 20:01:41 -0700
commita88bd9b0d4644fc9dfc8764777d453d748f0dd3b (patch)
treed0233db482c55f82d6faf4abf60158ebf359d76e
parentc15bf97181052747b9ff9646ba8560a6cff5bd1c (diff)
Fix Jetty server calling buck with custom PATH
The PATH used by buck build on the command line should also be used when invoking during reload. This ensures the same Java is available to the compiler. Change-Id: Ib3415539f3022d4f001d902d820059705f2fb5b8
-rw-r--r--gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index 35df8d9a7d..33ac7b346c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -593,7 +593,7 @@ public class JettyServer {
ProcessBuilder proc = new ProcessBuilder(buck, "build", target)
.directory(root)
.redirectErrorStream(true);
- if (properties.contains("PATH")) {
+ if (properties.containsKey("PATH")) {
proc.environment().put("PATH", properties.getProperty("PATH"));
}
long start = System.currentTimeMillis();