*** old/src/share/vm/services/attachListener.hpp	Mon Sep 17 16:14:27 2012
--- new/src/share/vm/services/attachListener.hpp	Mon Sep 17 16:14:25 2012

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 50,74 ****
--- 50,74 ----
  };
  #endif // SERVICES_KERNEL
  
  class AttachListener: AllStatic {
   public:
!   static void init()  KERNEL_RETURN;
!   static void abort() KERNEL_RETURN;
!   static void init()  NOT_SERVICES_RETURN;
!   static void abort() NOT_SERVICES_RETURN;
  
    // invoke to perform clean-up tasks when all clients detach
!   static void detachall() KERNEL_RETURN;
!   static void detachall() NOT_SERVICES_RETURN;
  
    // indicates if the Attach Listener needs to be created at startup
!   static bool init_at_startup() KERNEL_RETURN_(false);
!   static bool init_at_startup() NOT_SERVICES_RETURN_(false);
  
    // indicates if we have a trigger to start the Attach Listener
!   static bool is_init_trigger() KERNEL_RETURN_(false);
!   static bool is_init_trigger() NOT_SERVICES_RETURN_(false);
  
! #ifdef SERVICES_KERNEL
! #if !INCLUDE_SERVICES
    static bool is_attach_supported()             { return false; }
- #else // SERVICES_KERNEL
   private:
    static volatile bool _initialized;
  
   public:
    static bool is_initialized()                  { return _initialized; }

*** 92,105 ****
--- 92,105 ----
    // platform specific data dump
    static void pd_data_dump();
  
    // dequeue the next operation
    static AttachOperation* dequeue();
! #endif // SERVICES_KERNEL
! #endif // !INCLUDE_SERVICES
  };
  
! #ifndef SERVICES_KERNEL
! #if INCLUDE_SERVICES
  class AttachOperation: public CHeapObj<mtInternal> {
   public:
    enum {
      name_length_max = 16,       // maximum length of  name
      arg_length_max = 1024,      // maximum length of argument

*** 149,156 ****
--- 149,156 ----
    }
  
    // complete operation by sending result code and any result data to the client
    virtual void complete(jint result, bufferedStream* result_stream) = 0;
  };
! #endif // SERVICES_KERNEL
! #endif // INCLUDE_SERVICES
  
  #endif // SHARE_VM_SERVICES_ATTACHLISTENER_HPP