# HG changeset patch
# User azvegint
# Date 1418648453 -10800
# Node ID 15b31c9a2351f5a415989078b0cfb9f88435848c
# Parent  be83f404724df35f57a512ed8e3b5d80c5dff271
7155963: Deadlock in SystemFlavorMap.getFlavorsForNative and SunToolkit.awtLock
Reviewed-by: ant, serb

diff -r be83f404724d -r 15b31c9a2351 jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java	Thu Dec 11 15:19:12 2014 +0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java	Mon Dec 15 16:00:53 2014 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -281,6 +281,11 @@
             }
         }
 
-        checkChange(formats);
+        XToolkit.awtUnlock();
+        try {
+            checkChange(formats);
+        } finally {
+            XToolkit.awtLock();
+        }
     }
 }