diff --git a/.hgtags b/.hgtags index 896a72c65a27e32d3b2cbd4e991d7cfb8999f89c..dcc4889e4cfadde52bcf630fd1fd922b186ec0cc 100644 --- a/.hgtags +++ b/.hgtags @@ -312,6 +312,7 @@ be30cb2a3088f2b7b334b499f7eddbd5312312a7 jdk8u20-b23 dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b24 dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b25 dd229c5f57bff4e75a70908294a13072b9a48385 jdk8u20-b26 +684a13a7d2ccc91d2ad709ecad1fddbcc992ee5a jdk8u20-b31 abca9f6f1a10e9f91b2538bbe7870f54f550d986 jdk8u25-b00 7d0627679c9fdeaaaa9fe15c7cc11af0763621ec jdk8u25-b01 b0277ec994b751ebb761814675352506cd56bcd6 jdk8u25-b02 @@ -329,4 +330,7 @@ c3a855402b923d3ba819b05292a971953fc8ed0b jdk8u25-b13 2a6df63ca0f0f59bb730638b05c72d77a23f93c8 jdk8u25-b14 412d9ade90401d098f3662bd688ab393008423bd jdk8u25-b15 f07bc5dab84c67f5d1dccbab318ee1c5485c852d jdk8u25-b16 +0000000000000000000000000000000000000000 jdk8u25-b16 +0000000000000000000000000000000000000000 jdk8u25-b16 +d067890f970f3a712f870f6311d20f3359b6eaf0 jdk8u25-b16 f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00 diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java b/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java index 2a12ed8ede6222dda76c25b35c5c8fe7bae25626..52bc738551809677b72a2fc9e306e968af2b4781 100644 --- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java +++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -56,19 +56,22 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI private PropertyChangeListener propertyChangeHandler; + @Override protected void installListeners(JScrollPane scrollPane) { super.installListeners(scrollPane); propertyChangeHandler = createPropertyChangeHandler(); scrollPane.addPropertyChangeListener(propertyChangeHandler); } - protected void uninstallListeners(JScrollPane scrollPane) { + @Override + protected void uninstallListeners(JComponent scrollPane) { super.uninstallListeners(scrollPane); scrollPane.removePropertyChangeListener(propertyChangeHandler); } private PropertyChangeListener createPropertyChangeHandler() { return new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent e) { String propertyName = e.getPropertyName(); @@ -92,6 +95,7 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI }}; } + @Override protected void installDefaults(JScrollPane scrollpane) { super.installDefaults(scrollpane); @@ -115,7 +119,7 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI } } - + @Override protected void uninstallDefaults(JScrollPane c) { super.uninstallDefaults(c); diff --git a/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java index 7c7b2d1936af6472f97d9880fec60c5ea1788ee2..4092e8546df3a0199086fb4d5255cadd69305974 100644 --- a/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java +++ b/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java @@ -1024,7 +1024,8 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { } } - protected void uninstallListeners(JScrollPane scrollPane) { + @Override + protected void uninstallListeners(JComponent scrollPane) { super.uninstallListeners(scrollPane); scrollPane.removePropertyChangeListener(propertyChangeHandler); } diff --git a/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java b/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java new file mode 100644 index 0000000000000000000000000000000000000000..ae62650465145e96643dd1fe4f148eacb2bee07b --- /dev/null +++ b/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2014, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8029837 + * @summary Test simulates the partial call to xjc ant task that fails with + * NullPointer exception + * @run main/othervm PreParseGrammarTest + */ + +import com.sun.org.apache.xerces.internal.parsers.XMLGrammarPreparser; +import com.sun.org.apache.xerces.internal.xni.XNIException; +import com.sun.org.apache.xerces.internal.xni.grammars.Grammar; +import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarDescription; +import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +public class PreParseGrammarTest { + + public static void main(String[] args) throws FileNotFoundException, XNIException, IOException { + File xsdf = new File(System.getProperty("test.src", ".") + "/test.xsd"); + InputStream is = new BufferedInputStream(new FileInputStream(xsdf)); + XMLInputSource xis = new XMLInputSource(null, null, null, is, null); + XMLGrammarPreparser gp = new XMLGrammarPreparser(); + gp.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null); + //The NullPointerException is observed on next call during ant task + // execution + Grammar res = gp.preparseGrammar(XMLGrammarDescription.XML_SCHEMA, xis); + System.out.println("Grammar preparsed successfully:" + res); + return; + } +} diff --git a/test/javax/xml/bind/xjc/8029837/test.xsd b/test/javax/xml/bind/xjc/8029837/test.xsd new file mode 100644 index 0000000000000000000000000000000000000000..f7ee730e98a5b4a80a1df270cab8fbb5b1fcfe30 --- /dev/null +++ b/test/javax/xml/bind/xjc/8029837/test.xsd @@ -0,0 +1,4 @@ + + + +