changeset 4914:58c548d6b53e

Merge
author michaelm
date Tue, 31 Jan 2012 09:19:02 +0000
parents 3c97da8e33ec e7370ef55062
children 4c06f31fd3a2 afcc933a944e
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTView.m	Mon Jan 30 16:27:04 2012 +0000
+++ b/src/macosx/native/sun/awt/AWTView.m	Tue Jan 31 09:19:02 2012 +0000
@@ -300,8 +300,8 @@
 }
 
 - (BOOL) performKeyEquivalent: (NSEvent *) event {
-    [self deliverJavaKeyEventHelper: event];        
-    return TRUE;
+    [self deliverJavaKeyEventHelper: event];
+    return NO;
 }
 
 /**
--- a/test/tools/pack200/Pack200Test.java	Mon Jan 30 16:27:04 2012 +0000
+++ b/test/tools/pack200/Pack200Test.java	Tue Jan 31 09:19:02 2012 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, 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
@@ -46,7 +46,7 @@
     private static ArrayList <File> jarList = new ArrayList<File>();
     static final MemoryMXBean mmxbean = ManagementFactory.getMemoryMXBean();
     static final long m0 = getUsedMemory();
-    static final int LEAK_TOLERANCE = 20000; // OS and GC related variations.
+    static final int LEAK_TOLERANCE = 21000; // OS and GC related variations.
 
     /** Creates a new instance of Pack200Test */
     private Pack200Test() {}