Mercurial > hg > openjdk > jigsaw > jaxp

changeset 436:3206516132e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ewendeli
date Tue, 19 Feb 2013 21:45:15 +0100
parents 573e789c187a (diff) f4898ff0aff1 (current diff)
children 46ce56a4e40f
files
diffstat 4 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 12 15:19:19 2012 -0800
+++ b/.hgtags	Tue Feb 19 21:45:15 2013 +0100
@@ -197,3 +197,4 @@
 84946404d1e1de003ed2bf218ef8d48906a90e37 jdk8-b73
 2087e24a4357eceb6432e94918e75fdc706a27d6 jdk8-b74
 ff0b73a6b3f6cea644d37d56d746a37743419fa7 jdk8-b75
+0c08593944d0cd30645f6e1e4946c51ff2b10c8c jdk8-b76
--- a/makefiles/BuildJaxp.gmk	Wed Dec 12 15:19:19 2012 -0800
+++ b/makefiles/BuildJaxp.gmk	Tue Feb 19 21:45:15 2013 +0100
@@ -30,8 +30,6 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
-		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
 DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
 
 # The generate new bytecode uses the new compiler for to generate bytecode
@@ -39,7 +37,7 @@
 # cannot necessarily be run with the boot jdk.
 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
      JVM:=$(JAVA),\
-     JAVAC:=$(JAVAC_JARS),\
+     JAVAC:=$(NEW_JAVAC),\
      FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
--- a/src/javax/xml/validation/SchemaFactoryFinder.java	Wed Dec 12 15:19:19 2012 -0800
+++ b/src/javax/xml/validation/SchemaFactoryFinder.java	Tue Feb 19 21:45:15 2013 +0100
@@ -68,7 +68,7 @@
         // Use try/catch block to support applets
         try {
             debug = ss.getSystemProperty("jaxp.debug") != null;
-        } catch (Exception _) {
+        } catch (Exception unused) {
             debug = false;
         }
     }
@@ -113,7 +113,7 @@
                 debugPrintln("using thread context class loader ("+classLoader+") for search");
                 return;
             }
-        } catch( Throwable _ ) {
+        } catch( Throwable unused ) {
             ; // getContextClassLoader() undefined in JDK1.1
         }
 
--- a/src/javax/xml/xpath/XPathFactoryFinder.java	Wed Dec 12 15:19:19 2012 -0800
+++ b/src/javax/xml/xpath/XPathFactoryFinder.java	Tue Feb 19 21:45:15 2013 +0100
@@ -56,7 +56,7 @@
         // Use try/catch block to support applets
         try {
             debug = ss.getSystemProperty("jaxp.debug") != null;
-        } catch (Exception _) {
+        } catch (Exception unused) {
             debug = false;
         }
     }
@@ -111,7 +111,7 @@
                 debugPrintln("using thread context class loader ("+classLoader+") for search");
                 return;
             }
-        } catch( Throwable _ ) {
+        } catch( Throwable unused ) {
             ; // getContextClassLoader() undefined in JDK1.1
         }