From 302bb544948a8dda8e937aa855c898c8401b4a7f Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Mon, 19 Oct 2009 13:43:25 -0700
Subject: [PATCH] 6889255: javac MethodSymbol throws NPE if ClassReader does
 not read parameter names correctly

Reviewed-by: darcy
---
 jdk/make/common/shared/Defs-java.gmk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk
index eb63179f6d3..f9ed6353131 100644
--- a/jdk/make/common/shared/Defs-java.gmk
+++ b/jdk/make/common/shared/Defs-java.gmk
@@ -165,11 +165,6 @@ else
   JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
 endif
 
-#always use the bootstrap javah until bug-ID 6889255 is fixed.  These
-#five lines should be removed as part of that fix:
-JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-		  $(JAVAHFLAGS)
-
 # Override of what javac to use (see deploy workspace)
 ifdef JAVAC
   JAVAC_CMD     = $(JAVAC)