Fix NumberFormatException in LinuxEphemeralPortRangeDetector

Fix NumberFormatException in LinuxEphemeralPortRangeDetector when the ephemeral port file contains multiple whispaces. Fixes #7354 Signed-off-by: Alexei Barantsev <barancev@gmail.com>
SeleniumHQ · Jul 18, 2019 · f2518bf · f2518bf
1 parent df8eed8
commit f2518bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/net/LinuxEphemeralPortRangeDetector.java b/java/client/src/org/openqa/selenium/net/LinuxEphemeralPortRangeDetector.java
@@ -46,7 +46,7 @@ public static LinuxEphemeralPortRangeDetector getInstance() {
     int lowPort = defaultRange.getLowestEphemeralPort();
     int highPort = defaultRange.getHighestEphemeralPort();
     try (BufferedReader in = new BufferedReader(inputFil)) {
-      String[] split = in.readLine().split("\\s");
+      String[] split = in.readLine().split("\\s+");
       lowPort = Integer.parseInt(split[0]);
       highPort = Integer.parseInt(split[1]);
     } catch (IOException ignore) {

diff --git a/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java b/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java
@@ -43,6 +43,15 @@ public void decodeEphemeralPorts() {
     assertThat(ephemeralEphemeralPortDetector.getHighestEphemeralPort()).isEqualTo(65533);
   }
 
+  @Test
+  public void decodeEphemeralPortsWithWhitespaces() {
+    String range ="1234         65533";
+    EphemeralPortRangeDetector ephemeralEphemeralPortDetector =
+      new LinuxEphemeralPortRangeDetector(new StringReader(range));
+    assertThat(ephemeralEphemeralPortDetector.getLowestEphemeralPort()).isEqualTo(1234);
+    assertThat(ephemeralEphemeralPortDetector.getHighestEphemeralPort()).isEqualTo(65533);
+  }
+
   @Test
   public void currentValues() {
     LinuxEphemeralPortRangeDetector detector = LinuxEphemeralPortRangeDetector.getInstance();