Mercurial > hg > openjdk > bsd-port > jdk
changeset 8233:a4e5054913ce jdk7u80-b10
Merge
author | asaha |
---|---|
date | Thu, 09 Apr 2015 21:27:34 -0700 |
parents | cc138142bc94 (current diff) 994e555b3160 (diff) |
children | 502eb4ac29ba |
files | .hgtags |
diffstat | 4 files changed, 53 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Feb 10 23:32:48 2015 +0000 +++ b/.hgtags Thu Apr 09 21:27:34 2015 -0700 @@ -564,6 +564,7 @@ e83b7d88c57654b0ebf78b5139bd74463a130525 jdk7u79-b07 f94dd20a1efaa3b0b4345992330dfe7cddae343b jdk7u79-b08 4fca88d471f4020266574064fa65787083ab1274 jdk7u79-b09 +a476addbc2a4c88b34e5aacfe00bfc635f895c14 jdk7u79-b10 f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06 feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07 f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
--- a/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h Tue Feb 10 23:32:48 2015 +0000 +++ b/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h Thu Apr 09 21:27:34 2015 -0700 @@ -30,6 +30,8 @@ extern "C" { #endif +#include <stddef.h> + #include "java_awt_AlphaComposite.h" #include "SurfaceData.h" @@ -484,7 +486,9 @@ #define ArraySize(A) (sizeof(A) / sizeof(A[0])) #define PtrAddBytes(p, b) ((void *) (((intptr_t) (p)) + (b))) -#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, (y)*(yinc) + (x)*(xinc)) +#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, \ + ((ptrdiff_t)(y))*(yinc) + \ + ((ptrdiff_t)(x))*(xinc)) /* * The function to call with an array of NativePrimitive structures
--- a/test/java/awt/Focus/SortingFPT/JDK8048887.java Tue Feb 10 23:32:48 2015 +0000 +++ b/test/java/awt/Focus/SortingFPT/JDK8048887.java Thu Apr 09 21:27:34 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, 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 @@ -22,13 +22,12 @@ */ /* - @test - @bug 8048887 - @summary Tests SortingFTP for an exception caused by the tim-sort algo. - @author anton.tarasov: area=awt.focus - @run main JDK8040632 -*/ - + @test + @bug 8048887 + @summary Tests SortingFTP for an exception caused by the tim-sort algo. + @author anton.tarasov: area=awt.focus + @run main JDK8048887 + */ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.SwingUtilities; @@ -53,28 +52,31 @@ public void start() { final CountDownLatch latch = new CountDownLatch(1); - SwingUtilities.invokeLater(() -> { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { // Catch the original exception which sounds like: // java.lang.IllegalArgumentException: Comparison method violates its general contract! Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { - public void uncaughtException(Thread t, Throwable e) { - e.printStackTrace(); - if (e instanceof IllegalArgumentException) { - passed = false; - latch.countDown(); - } + public void uncaughtException(Thread t, Throwable e) { + e.printStackTrace(); + if (e instanceof IllegalArgumentException) { + passed = false; + latch.countDown(); } - }); + } + }); TestDialog d = new TestDialog(); // It's expected that the dialog is focused on start. // The listener is called after the FTP completes processing and the bug is reproduced or not. d.addWindowFocusListener(new WindowAdapter() { - public void windowGainedFocus(WindowEvent e) { - latch.countDown(); - } + public void windowGainedFocus(WindowEvent e) { + latch.countDown(); + } }); d.setVisible(true); + } }); try { @@ -83,10 +85,11 @@ e.printStackTrace(); } - if (passed) + if (passed) { System.out.println("Test passed."); - else + } else { throw new RuntimeException("Test failed!"); + } } } @@ -94,20 +97,19 @@ // The layout of the components reproduces the transitivity issue // with SortingFocusTraversalPolicy relying on the tim-sort algo. - - private static int[] Xs = new int[] {71, 23, 62, 4, 79, 39, 34, 9, 84, 58, 30, 34, 38, 15, 69, 10, 44, 95, 70, 54, - 44, 62, 77, 64, 70, 83, 31, 48, 96, 54, 40, 3, 60, 58, 3, 20, 94, 54, 26, 19, 48, 47, 12, 70, 86, 43, 71, 97, 19, - 69, 90, 22, 43, 76, 10, 60, 29, 49, 9, 9, 15, 73, 85, 80, 81, 35, 87, 43, 17, 57, 38, 44, 29, 86, 96, 15, 57, 26, - 27, 78, 26, 87, 43, 6, 4, 16, 57, 99, 32, 86, 96, 5, 50, 69, 12, 4, 36, 84, 71, 60, 22, 46, 11, 44, 87, 3, 23, 14, - 43, 25, 32, 44, 11, 18, 77, 2, 51, 87, 88, 53, 69, 37, 14, 10, 25, 73, 39, 33, 91, 51, 96, 9, 74, 66, 70, 42, 72, - 7, 82, 40, 91, 33, 83, 54, 33, 50, 83, 1, 81, 32, 66, 11, 75, 56, 53, 45, 1, 69, 46, 31, 79, 58, 12, 20, 92, 49, - 50, 90, 33, 8, 43, 93, 72, 78, 9, 56, 84, 60, 30, 39, 33, 88, 84, 56, 49, 47, 4, 90, 57, 6, 23, 96, 37, 88, 22, 79, - 35, 80, 45, 55}; + private static int[] Xs = new int[]{71, 23, 62, 4, 79, 39, 34, 9, 84, 58, 30, 34, 38, 15, 69, 10, 44, 95, 70, 54, + 44, 62, 77, 64, 70, 83, 31, 48, 96, 54, 40, 3, 60, 58, 3, 20, 94, 54, 26, 19, 48, 47, 12, 70, 86, 43, 71, 97, 19, + 69, 90, 22, 43, 76, 10, 60, 29, 49, 9, 9, 15, 73, 85, 80, 81, 35, 87, 43, 17, 57, 38, 44, 29, 86, 96, 15, 57, 26, + 27, 78, 26, 87, 43, 6, 4, 16, 57, 99, 32, 86, 96, 5, 50, 69, 12, 4, 36, 84, 71, 60, 22, 46, 11, 44, 87, 3, 23, 14, + 43, 25, 32, 44, 11, 18, 77, 2, 51, 87, 88, 53, 69, 37, 14, 10, 25, 73, 39, 33, 91, 51, 96, 9, 74, 66, 70, 42, 72, + 7, 82, 40, 91, 33, 83, 54, 33, 50, 83, 1, 81, 32, 66, 11, 75, 56, 53, 45, 1, 69, 46, 31, 79, 58, 12, 20, 92, 49, + 50, 90, 33, 8, 43, 93, 72, 78, 9, 56, 84, 60, 30, 39, 33, 88, 84, 56, 49, 47, 4, 90, 57, 6, 23, 96, 37, 88, 22, 79, + 35, 80, 45, 55}; public TestDialog() { JPanel panel = new JPanel(new GridBagLayout()); GridBagConstraints gbc = new GridBagConstraints(); - for (int i=0; i < Xs.length; i++) { + for (int i = 0; i < Xs.length; i++) { gbc.gridx = Xs[i]; gbc.gridy = 100 - gbc.gridx; panel.add(new MyComponent(), gbc); @@ -117,7 +119,8 @@ } public static class MyComponent extends JPanel { - private final static Dimension SIZE = new Dimension(1,1); + + private final static Dimension SIZE = new Dimension(1, 1); public MyComponent() { setBackground(Color.BLACK);
--- a/test/sun/security/tools/keytool/ListKeychainStore.sh Tue Feb 10 23:32:48 2015 +0000 +++ b/test/sun/security/tools/keytool/ListKeychainStore.sh Thu Apr 09 21:27:34 2015 -0700 @@ -22,7 +22,7 @@ # # @test -# @bug 7133495 +# @bug 7133495 8041740 # @summary [macosx] KeyChain KeyStore implementation retrieves only one private key entry if [ "${TESTJAVA}" = "" ] ; then @@ -49,8 +49,10 @@ KEYTOOL="${TESTJAVA}/bin/keytool -storetype KeychainStore -keystore NONE -storepass $PWD" TEMPORARY_P12="$TESTCLASSES/7133495.p12" TEMPORARY_KC="$TESTCLASSES/7133495.keychain" +TEMPORARY_LIST="$TESTCLASSES/7133495.tmp" CLEANUP_P12="rm -f $TEMPORARY_P12" CLEANUP_KC="security delete-keychain $TEMPORARY_KC" +CLEANUP_LIST="rm -f $TEMPORARY_LIST" # Count the number of private key entries in the Keychain keystores @@ -115,6 +117,15 @@ fi echo "Imported keypairs from PKCS12 keystore into the keychain" +# Adjust the keychain search order + +echo "\"$TEMPORARY_KC\"" > $TEMPORARY_LIST +security list-keychains >> $TEMPORARY_LIST +security list-keychains -s `xargs < ${TEMPORARY_LIST}` +`$CLEANUP_LIST` +echo "Temporary keychain search order:" +security list-keychains + # Recount the number of private key entries in the Keychain keystores COUNT=`$KEYTOOL -list | grep PrivateKeyEntry | wc -l`