--- a/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java Tue Sep 02 17:35:58 2014 +0400
+++ b/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java Tue Sep 02 17:42:35 2014 +0400
@@ -418,7 +418,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();
}
}