Projects >> operaprestodriver >>9638f72eefaf7d34dcacdc30256f87329b6267a8

Chunk
Conflicting content
   * (probably response to command).
   */
  public void parseServiceList(String message) {
<<<<<<< HEAD
    // We expect the service list to be in this format:
    //   *245 service-list window-manager core ecmascript-service
    int split = message.indexOf(' ');

    if (split < 0) {
      connectionHandler.onException(
          new IllegalStateException("Invalid service list received: " + message));
=======
    List services = ImmutableList.copyOf(Splitter.on(',').split(message.split(" ")[2]));

    if (services.size() <= 0) {
      connectionHandler.onException(
          new WebDriverException(String.format("Invalid service list received: %s", services)));
>>>>>>> ddcd028ceb94b5609fbb5dd2b71bf75d8c6b5554
      return;
    }
Solution content
   * (probably response to command).
   */
  public void parseServiceList(String message) {
    // We expect the service list to be in this format:
    //   *245 service-list window-manager,core,ecmascript-service
    List services = ImmutableList.copyOf(Splitter.on(',').split(message.split(" ")[2]));

    if (services.size() <= 0) {
      connectionHandler.onException(
          new IllegalStateException(String.format("Invalid service list received: %s", services)));
      return;
    }
File
StpConnection.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Variable