/*
Copyright 2007-2009 WebDriver committers
Copyright 2007-2009 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.
*/

// Copyright 2008 Google Inc.  All Rights Reserved.

package org.openqa.selenium.remote.server.handler;

import org.openqa.selenium.remote.server.DriverSessions;
import org.openqa.selenium.remote.server.rest.ResultType;
import org.openqa.selenium.server.log.LoggingManager;

public class DeleteSession extends WebDriverHandler {

  private final DriverSessions sessions;

  public DeleteSession(DriverSessions sessions) {
    super(sessions);
    this.sessions = sessions;
  }

  public ResultType call() throws Exception {
    getDriver().quit();
    LoggingManager.perSessionLogHandler().clearSessionLogRecords(getRealSessionId().toString());
    sessions.deleteSession(getRealSessionId());
    return ResultType.SUCCESS;
  }
  
  @Override
  public String toString() {
    return String.format("[delete session: %s]", getRealSessionId());
  }
}

/*
Copyright 2007-2009 WebDriver committers
Copyright 2007-2009 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.
*/

// Copyright 2008 Google Inc.  All Rights Reserved.

package org.openqa.selenium.remote.server.handler;

import org.openqa.selenium.remote.server.DriverSessions;
import org.openqa.selenium.remote.server.rest.ResultType;
import org.openqa.selenium.server.log.LoggingManager;
import org.openqa.selenium.server.log.PerSessionLogHandler;

public class DeleteSession extends WebDriverHandler {

  private final DriverSessions sessions;

  public DeleteSession(DriverSessions sessions) {
    super(sessions);
    this.sessions = sessions;
  }

  public ResultType call() throws Exception {
    getDriver().quit();
    PerSessionLogHandler perSessionLogHandler = LoggingManager.perSessionLogHandler();
    if (perSessionLogHandler != null) {
      perSessionLogHandler.clearSessionLogRecords(getRealSessionId().toString());
    }
    sessions.deleteSession(getRealSessionId());
    return ResultType.SUCCESS;
  }
  
  @Override
  public String toString() {
    return String.format("[delete session: %s]", getRealSessionId());
  }
}

Add null check