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

8098535: Test closed/java/awt/Clipboard/ImageTransferTest/ImageTransferTest fails on OEL 7.1

Browse Source 
Reviewed-by: serb, azvegint
This commit is contained in:
Semyon Sadetsky 2015-06-30 10:45:32 +03:00
parent dd57d9f3b9
commit e482146d84
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -554,9 +554,11 @@ static void update_poll_timeout(int timeout_control) {
curPollTimeout = min(AWT_MAX_POLL_TIMEOUT, curPollTimeout); curPollTimeout = min(AWT_MAX_POLL_TIMEOUT, curPollTimeout);
} else if (timeout_control == TIMEOUT_EVENTS) { } else if (timeout_control == TIMEOUT_EVENTS) {
/* subtract 1/4 (plus 1, in case the division truncates to 0) */ /* subtract 1/4 (plus 1, in case the division truncates to 0) */
if (curPollTimeout > 0) {
curPollTimeout -= ((curPollTimeout>>2) + 1); curPollTimeout -= ((curPollTimeout>>2) + 1);
curPollTimeout = max(AWT_MIN_POLL_TIMEOUT, curPollTimeout); curPollTimeout = max(AWT_MIN_POLL_TIMEOUT, curPollTimeout);
} }
}
break; break;
case AWT_POLL_AGING_FAST: case AWT_POLL_AGING_FAST:
if (timeout_control == TIMEOUT_TIMEDOUT) { if (timeout_control == TIMEOUT_TIMEDOUT) {