commit a132f0e3091cbc25f3d0352cb7f503fdbf07bcff
author Michajlo Matijkiw <michajlo@google.com> Mon Nov 21 17:30:43 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Mon Nov 21 20:04:43 2016 +0000
tree aead3cb203e83801ca240a33851b10aa09381c35
parent 324b592055378c305a31009ecfbba0cb78935003

Use find instead of match for client_env filtering

--
MOS_MIGRATED_REVID=139794968

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 61a02ab..999d286 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -111,8 +111,8 @@
  * <p>The parts specific to the current command are stored in {@link CommandEnvironment}.
  */
 public final class BlazeRuntime {
-  private static final Pattern suppressFromLog = Pattern.compile(".*(auth|pass|cookie).*",
-      Pattern.CASE_INSENSITIVE);
+  private static final Pattern suppressFromLog =
+      Pattern.compile("(auth|pass|cookie)", Pattern.CASE_INSENSITIVE);
 
   private static final Logger LOG = Logger.getLogger(BlazeRuntime.class.getName());
 
@@ -593,7 +593,7 @@
         int varStart = "--client_env=".length();
         int varEnd = s.indexOf('=', varStart);
         String varName = s.substring(varStart, varEnd);
-        if (suppressFromLog.matcher(varName).matches()) {
+        if (suppressFromLog.matcher(varName).find()) {
           buf.append("--client_env=");
           buf.append(varName);
           buf.append("=__private_value_removed__");