--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java	2017-10-24 11:21:08.221439001 +0530
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java	2017-10-24 11:21:07.989439001 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -42,7 +42,7 @@
   private static AddressField  osThreadField;
 
   // Field from OSThread
-  private static Field         osThreadThreadIdField;
+  private static Field         threadIdField;
 
   // This is currently unneeded but is being kept in case we change
   // the currentFrameGuess algorithm
@@ -63,7 +63,7 @@
     osThreadField           = type.getAddressField("_osthread");
 
     type = db.lookupType("OSThread");
-    osThreadThreadIdField = type.getField("_thread_id");
+    threadIdField = type.getField("_thread_id");
   }
 
   public Address getLastJavaFP(Address addr) {
@@ -129,7 +129,7 @@
     Address osThreadAddr = osThreadField.getValue(addr);
     // Get the address of the thread_id within the OSThread
     Address threadIdAddr =
-      osThreadAddr.addOffsetTo(osThreadThreadIdField.getOffset());
+      osThreadAddr.addOffsetTo(threadIdField.getOffset());
     JVMDebugger debugger = VM.getVM().getDebugger();
     return debugger.getThreadForIdentifierAddress(threadIdAddr);
   }