changeset 7735:2d3c1f9dc8ff

Merge
author asaha
date Thu, 02 Oct 2014 08:39:41 -0700
parents 76d3dbc69959 7a1cab2d30f6
children a86025de3dfa 550c9196d41b
files .hgtags
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 02 08:31:59 2014 -0700
+++ b/.hgtags	Thu Oct 02 08:39:41 2014 -0700
@@ -465,6 +465,7 @@
 388d34a2e45c2660e7ede2a9d80949b14b5d8df9 jdk7u67-b31
 de2b809bb95904bfd5c2ad47cf0f41c97abd5750 jdk7u67-b32
 193d852a6dce1aaf47f1e6960e1c83936bd0e0a4 jdk7u67-b33
+d425e2aa1a6bcdf909c9ac7f690f3e87dcf6e3f6 jdk7u67-b34
 9ccfe70cee626ac7831cfa7b7a7eb7a88fe1cd42 jdk7u66-b00
 fc87b55d62fc1e81aaf61ff21175129b8ccc302e jdk7u66-b01
 c67e394e49429565540f04c5c2a5544f750658bb jdk7u66-b09
--- a/src/share/classes/java/awt/event/InputMethodEvent.java	Thu Oct 02 08:31:59 2014 -0700
+++ b/src/share/classes/java/awt/event/InputMethodEvent.java	Thu Oct 02 08:39:41 2014 -0700
@@ -417,7 +417,8 @@
     private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
         s.defaultReadObject();
         if (when == 0) {
-            when = getMostRecentEventTimeForSource(this.source);
+            // Can't use getMostRecentEventTimeForSource because source is always null during deserialization
+            when = EventQueue.getMostRecentEventTime();
         }
     }