*** old/src/share/vm/prims/jvmtiEnvBase.hpp	Mon Sep 17 16:13:19 2012
--- new/src/share/vm/prims/jvmtiEnvBase.hpp	Mon Sep 17 16:13:18 2012

*** 54,64 ****
--- 54,66 ----
  
  class JvmtiEnvBase : public CHeapObj<mtInternal> {
  
   private:
  
+ #if INCLUDE_JVMTI
    static JvmtiEnvBase*     _head_environment;  // head of environment list
+ #endif // INCLUDE_JVMTI
  
    static bool              _globally_initialized;
    static jvmtiPhase        _phase;
    static volatile int      _dying_thread_env_iteration_count;
  

*** 127,137 ****
--- 129,142 ----
    static void periodic_clean_up();
  
    friend class JvmtiEnvIterator;
    JvmtiEnv* next_environment()                     { return (JvmtiEnv*)_next; }
    void set_next_environment(JvmtiEnvBase* env)     { _next = env; }
-   static JvmtiEnv* head_environment()              { return (JvmtiEnv*)_head_environment; }
+     JVMTI_ONLY(return (JvmtiEnv*)_head_environment); 
+     NOT_JVMTI(return NULL);
+   }
  
   public:
  
    bool is_valid();