stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6340263: Regression testcase java/awt/dnd/DnDClipboardDeadlockTest throughs IOException: Owner timed out

Browse Source 
Reviewed-by: anthony, art
This commit is contained in:
Denis Fokin 2011-01-28 16:52:10 +03:00
parent 5c7903af7d
commit d4946d1ec3
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jdk/src/solaris/classes/sun/awt/X11/XSelection.java
View File

@ -301,13 +301,8 @@ public final class XSelection {
} finally {
XToolkit.awtUnlock();
}
if (!dataGetter.isExecuted()) {
throw new IOException("Owner timed out");
}
if (dataGetter.isDisposed()) {
throw new IOException("Owner failed to convert data");
}
validateDataGetter(dataGetter);
// Handle incremental transfer.
if (dataGetter.getActualType() ==
@ -380,14 +375,7 @@ public final class XSelection {
XToolkit.awtUnlock();
}
// The owner didn't respond - terminate the transfer.
if (!incrDataGetter.isExecuted()) {
throw new IOException("Owner timed out");
}
if (incrDataGetter.isDisposed()) {
throw new IOException("Owner failed to convert data");
}
validateDataGetter(dataGetter);
if (incrDataGetter.getActualFormat() != 8) {
throw new IOException("Unsupported data format: " +
@ -445,6 +433,23 @@ public final class XSelection {
return data != null ? data : new byte[0];
}
void validateDataGetter(WindowPropertyGetter propertyGetter)
throws IOException
{
// The order of checks is important because a property getter
// has not been executed in case of timeout as well as in case of
// changed selection owner.
if (propertyGetter.isDisposed()) {
throw new IOException("Owner failed to convert data");
}
// The owner didn't respond - terminate the transfer.
if (!propertyGetter.isExecuted()) {
throw new IOException("Owner timed out");
}
}
// To be MT-safe this method should be called under awtLock.
boolean isOwner() {
return isOwner;