From fb226280bb8f0d11de8dec6c2db60864387b9e6c Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Mon, 15 Dec 2014 16:00:53 +0300
Subject: [PATCH] 7155963: Deadlock in SystemFlavorMap.getFlavorsForNative and
 SunToolkit.awtLock

Reviewed-by: ant, serb
---
 .../unix/classes/sun/awt/X11/XClipboard.java             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
index 7068b665ac5..0bad274f5e2 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
@@ -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 @@ public final class XClipboard extends SunClipboard implements OwnershipListener
             }
         }
 
-        checkChange(formats);
+        XToolkit.awtUnlock();
+        try {
+            checkChange(formats);
+        } finally {
+            XToolkit.awtLock();
+        }
     }
 }