changeset 10901:a7947590cba0

Merge
author asaha
date Mon, 13 Apr 2015 23:42:02 -0700
parents 001f0a80fd3f 0460d0b4b168
children 6d6c0c93e822
files .hgtags
diffstat 4 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 13 22:50:57 2015 -0700
+++ b/.hgtags	Mon Apr 13 23:42:02 2015 -0700
@@ -385,6 +385,7 @@
 9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24
 f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25
 97f258823d7d8ee0ec7d774b79cd30492520cc10 jdk8u40-b26
+d4453d784fb6c52e4ed998b167588551e2fd43c5 jdk8u40-b27
 1ecc234bd38950a2bc047aa253a5e803f0836a4e jdk8u45-b00
 e0c7864bbca3f76cde680722f2ae58dff2bff61d jdk8u45-b01
 9505c0392cddbfb905401e9fccc23262edc3254f jdk8u45-b02
@@ -397,6 +398,8 @@
 1083da8a8ec17058de5a35be3e5a821affc19e4e jdk8u45-b09
 3edfbb32b3c04941eedc551c02d4eec1e0f92078 jdk8u45-b10
 c669323bd55ac59ad26c7ee4f47a6daefc82af8e jdk8u45-b11
+6a8f9512afa687632f0a0d881bbdb446d984a74c jdk8u45-b12
+55a75b0db87693e1e186752f553c337cb035a38e jdk8u45-b13
 ac97b69b88e37c18c1b077be8b1f100b6803fea5 jdk8u51-b00
 2e0732282470f7a02d57af5fc8542efa9db7b3e4 jdk8u51-b01
 cc75137936f9a8e97017e7e18b1064b76238116f jdk8u51-b02
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Mon Apr 13 22:50:57 2015 -0700
+++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Mon Apr 13 23:42:02 2015 -0700
@@ -131,11 +131,7 @@
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
     *scaleFactor = 1;
     char* scaledFile = nil;
-    __block float screenScaleFactor = 1;
-
-    [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
-        screenScaleFactor = [SplashNSScreen() backingScaleFactor];
-    }];
+    float screenScaleFactor = 1;
 
     if (screenScaleFactor > 1) {
         NSString *fileName = [NSString stringWithUTF8String: file];
--- a/src/share/classes/sun/security/ssl/ClientHandshaker.java	Mon Apr 13 22:50:57 2015 -0700
+++ b/src/share/classes/sun/security/ssl/ClientHandshaker.java	Mon Apr 13 23:42:02 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -289,7 +289,7 @@
             case K_ECDH_RSA:
                 throw new SSLProtocolException(
                     "Protocol violation: server sent a server key exchange"
-                    + "message for key exchange " + keyExchange);
+                    + " message for key exchange " + keyExchange);
             case K_KRB5:
             case K_KRB5_EXPORT:
                 throw new SSLProtocolException(
--- a/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Mon Apr 13 22:50:57 2015 -0700
+++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Mon Apr 13 23:42:02 2015 -0700
@@ -36,7 +36,7 @@
 import sun.java2d.SunGraphics2D;
 
 /**
- * @test
+ * test
  * @bug 8043869
  * @author Alexander Scherbatiy
  * @summary [macosx] java -splash does not honor 2x hi dpi notation for retina