src/share/vm/prims/jvmtiEnter.xsl

*** 492,502 ****
      </xsl:if>
      <xsl:text>    return JVMTI_ERROR_WRONG_PHASE;
    }</xsl:text>  
  
        <xsl:text>  
!   Thread* this_thread = (Thread*)ThreadLocalStorage::thread(); </xsl:text>
  
        <xsl:apply-templates select="." mode="transition"/>
      </xsl:when>
      <xsl:otherwise>
        <xsl:if test="contains(@phase,'onload')">
--- 492,502 ----
      </xsl:if>
      <xsl:text>    return JVMTI_ERROR_WRONG_PHASE;
    }</xsl:text>  
  
        <xsl:text>  
!   Thread* this_thread = Thread::current_or_null(); </xsl:text>
  
        <xsl:apply-templates select="." mode="transition"/>
      </xsl:when>
      <xsl:otherwise>
        <xsl:if test="contains(@phase,'onload')">
*** 526,536 ****
      }
  </xsl:text>
      </xsl:if>
      <xsl:text>    return JVMTI_ERROR_WRONG_PHASE;
    }
!   Thread* this_thread = (Thread*)ThreadLocalStorage::thread(); </xsl:text>
        <xsl:apply-templates select="." mode="transition"/>
        </xsl:if>
      </xsl:otherwise>
    </xsl:choose>
  
--- 526,536 ----
      }
  </xsl:text>
      </xsl:if>
      <xsl:text>    return JVMTI_ERROR_WRONG_PHASE;
    }
!   Thread* this_thread = Thread::current_or_null(); </xsl:text>
        <xsl:apply-templates select="." mode="transition"/>
        </xsl:if>
      </xsl:otherwise>
    </xsl:choose>
  
*** 556,575 ****
    <xsl:choose>
      <xsl:when test="count(@phase)=1 and not(contains(@phase,'live')) and not(contains(@phase,'start'))">    
        <xsl:choose>
          <xsl:when test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))">
            <xsl:text>  if (Threads::number_of_threads() != 0) {
!     Thread* this_thread = (Thread*)ThreadLocalStorage::thread();</xsl:text>
          </xsl:when>
          <xsl:otherwise>
  
            <xsl:text>  Thread* this_thread = NULL;
    bool transition;
    if (Threads::number_of_threads() == 0) {
      transition = false;
    } else {
!     this_thread = (Thread*)ThreadLocalStorage::thread();
      transition = ((this_thread != NULL) &amp;&amp; !this_thread->is_VM_thread() &amp;&amp; !this_thread->is_ConcurrentGC_thread());
    }
    if (transition) {</xsl:text>
          </xsl:otherwise>
  
--- 556,575 ----
    <xsl:choose>
      <xsl:when test="count(@phase)=1 and not(contains(@phase,'live')) and not(contains(@phase,'start'))">    
        <xsl:choose>
          <xsl:when test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))">
            <xsl:text>  if (Threads::number_of_threads() != 0) {
!     Thread* this_thread = Thread::current_or_null();</xsl:text>
          </xsl:when>
          <xsl:otherwise>
  
            <xsl:text>  Thread* this_thread = NULL;
    bool transition;
    if (Threads::number_of_threads() == 0) {
      transition = false;
    } else {
!     this_thread = Thread::current_or_null();
      transition = ((this_thread != NULL) &amp;&amp; !this_thread->is_VM_thread() &amp;&amp; !this_thread->is_ConcurrentGC_thread());
    }
    if (transition) {</xsl:text>
          </xsl:otherwise>