changeset 8152:e1562d834e75

Merge
author asaha
date Mon, 03 Nov 2014 12:42:41 -0800
parents ac8cca8ec90c 3ffaec4e32f2
children 24d4fdd0320c
files .hgtags
diffstat 3 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 27 15:19:33 2014 -0700
+++ b/.hgtags	Mon Nov 03 12:42:41 2014 -0800
@@ -518,6 +518,7 @@
 1964c973dcc1ddb30115b7c7b6183548b3adcdf5 jdk7u75-b04
 ec3e1e179298a41bc6b77a170e2da66efb0bae3b jdk7u75-b05
 e9596c6470c944ff19c5198cfeb7fd979aad9120 jdk7u75-b06
+e0afb6ec0633d18f360f074c5672fa4c2196ea39 jdk7u75-b07
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
@@ -525,5 +526,6 @@
 50322d45a16bd3f50a050f858495a586395e6095 jdk7u76-b04
 e41867e626749cf34019f9e45493cf049acbcec4 jdk7u76-b05
 7ca26abf06dd8e11c6d7f6ad724b8d5abc3c709d jdk7u76-b06
+84163d4b66f0acc5301223cd25b4093780950640 jdk7u76-b07
 45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00
 
--- a/src/macosx/native/sun/awt/AWTWindow.m	Mon Oct 27 15:19:33 2014 -0700
+++ b/src/macosx/native/sun/awt/AWTWindow.m	Mon Nov 03 12:42:41 2014 -0800
@@ -320,7 +320,8 @@
 
 // return id for the topmost window under mouse
 + (NSInteger) getTopmostWindowUnderMouseID {
-
+    NSInteger result = -1;
+    
     NSRect screenRect = [[NSScreen mainScreen] frame];
     NSPoint nsMouseLocation = [NSEvent mouseLocation];
     CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);
@@ -334,11 +335,13 @@
             CGRect rect;
             CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
             if (CGRectContainsPoint(rect, cgMouseLocation)) {
-                return [[window objectForKey:(id)kCGWindowNumber] integerValue];
+                result = [[window objectForKey:(id)kCGWindowNumber] integerValue];
+                break;
             }
         }
     }
-    return -1;
+    [windows release];
+    return result;
 }
 
 // checks that this window is under the mouse cursor and this point is not overlapped by other windows
--- a/src/share/classes/sun/security/smartcardio/CardImpl.java	Mon Oct 27 15:19:33 2014 -0700
+++ b/src/share/classes/sun/security/smartcardio/CardImpl.java	Mon Nov 03 12:42:41 2014 -0800
@@ -262,9 +262,6 @@
                     "sun.security.smartcardio.invertCardReset", "true")));
 
     public void disconnect(boolean reset) throws CardException {
-        if (invertReset) {
-            reset = !reset;
-        }
         if (reset) {
             checkSecurity("reset");
         }
@@ -272,6 +269,10 @@
             return;
         }
         checkExclusive();
+        // to preserve old behaviour, don't change flag until here
+        if (invertReset) {
+            reset = !reset;
+        }
         try {
             SCardDisconnect(cardId, (reset ? SCARD_RESET_CARD : SCARD_LEAVE_CARD));
         } catch (PCSCException e) {