// Copyright 2016 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////

package com.google.pubsub.flic.controllers;

/**
 * Keeps track of the parameters that define a client.
 */
public class ClientParams {
  public final String subscription;
  public final Client.ClientType clientType;

  public ClientParams(Client.ClientType clientType, String subscription) {
    this.clientType = clientType;
    this.subscription = subscription;
  }

  /**
   * @return the clientType
   */
  public Client.ClientType getClientType() {
    return clientType;
  }

  @Override
  public boolean equals(Object obj) {
    if (obj == this) {
      return true;
    }
    if (obj == null || obj.getClass() != this.getClass()) {
      return false;
    }
    ClientParams other = (ClientParams) obj;
    return subscription.equals(other.subscription)
        && clientType.equals(other.getClientType());
  }

  @Override
  public int hashCode() {
    final int prime = 31;
    int result = 1;
    result = prime * result + ((subscription == null) ? 0 : subscription.hashCode());
    result = prime * result + ((clientType == null) ? 0 : clientType.hashCode());
    return result;
  }

}

@@ -1387,105 +1387,307 @@
     
-return subscription.equals(other.subscription)%0A        && clientType.equals(other.getClientType()
+if (!clientType.equals(other.getClientType())) %7B%0A      return false;%0A    %7D%0A    if (subscription == null && other.subscription == null) %7B%0A      return true;%0A    %7D%0A    if (subscription == null %7C%7C other.subscription == null) %7B%0A      return false;%0A    %7D%0A    return subscription.equals(other.subscription
 );%0A 

Update ClientParams.java