Fix potential NPE in test_utils WebServerDispatcher

PiperOrigin-RevId: 429338648
This commit is contained in:
olly 2022-02-17 18:11:38 +00:00 committed by Ian Baker
parent 38717ce969
commit fdd3973a09

View File

@ -29,6 +29,7 @@ import androidx.annotation.Nullable;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -241,7 +242,7 @@ public class WebServerDispatcher extends Dispatcher {
/** Returns the path for a given {@link RecordedRequest}, stripping any query parameters. */ /** Returns the path for a given {@link RecordedRequest}, stripping any query parameters. */
public static String getRequestPath(RecordedRequest request) { public static String getRequestPath(RecordedRequest request) {
return Util.splitAtFirst(request.getPath(), "\\?")[0]; return Util.splitAtFirst(Strings.nullToEmpty(request.getPath()), "\\?")[0];
} }
/** /**