changeset 7145:0d6bf4c0ec4c

Merge
author asaha
date Wed, 19 Feb 2014 12:21:32 -0800
parents 0712635c14c7 b23153655006
children 2acfa13df091
files .hgtags
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Feb 12 16:10:57 2014 -0800
+++ b/.hgtags	Wed Feb 19 12:21:32 2014 -0800
@@ -393,6 +393,8 @@
 795654fce29c38d4c8504f760d8d8a36248d38ed jdk7u55-b06
 4b2ed892b195e95f7541aaa3b129a2caa5faae1d jdk7u55-b07
 db1323224053a18ecc62bdc1d3902d93b33f0b70 jdk7u55-b08
+534eeff29ac9fcbbb99ef8908548dbb368d04baf jdk7u55-b09
+d39dd4135844ca5c707bc39ae1d7e020d49880ce jdk7u55-b09
 db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
 def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
 ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
--- a/src/share/classes/java/awt/event/InvocationEvent.java	Wed Feb 12 16:10:57 2014 -0800
+++ b/src/share/classes/java/awt/event/InvocationEvent.java	Wed Feb 19 12:21:32 2014 -0800
@@ -98,7 +98,7 @@
      *
      * @see #isDispatched
      */
-    protected volatile Object notifier;
+    protected Object notifier;
 
     /**
      * The (potentially null) Runnable whose run() method will be called
--- a/src/share/classes/java/lang/Thread.java	Wed Feb 12 16:10:57 2014 -0800
+++ b/src/share/classes/java/lang/Thread.java	Wed Feb 19 12:21:32 2014 -0800
@@ -366,6 +366,8 @@
             throw new NullPointerException("name cannot be null");
         }
 
+        this.name = name.toCharArray();
+
         Thread parent = currentThread();
         SecurityManager security = System.getSecurityManager();
         if (g == null) {
@@ -402,7 +404,6 @@
         this.group = g;
         this.daemon = parent.isDaemon();
         this.priority = parent.getPriority();
-        this.name = name.toCharArray();
         if (security == null || isCCLOverridden(parent.getClass()))
             this.contextClassLoader = parent.getContextClassLoader();
         else