--- a/src/java.desktop/share/classes/javax/swing/SwingWorker.java	Fri Jun 08 13:32:51 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/SwingWorker.java	Sat Jun 09 13:33:35 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -22,21 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package javax.swing;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.beans.PropertyChangeEvent;
 import java.util.List;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import java.awt.event.*;
-
-import javax.swing.SwingUtilities;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import sun.awt.AppContext;
 import sun.swing.AccumulativeRunnable;
@@ -597,6 +606,8 @@
      * //the dialog will be visible until the SwingWorker is done
      * dialog.setVisible(true);
      * </pre>
+     *
+     * @throws CancellationException {@inheritDoc}
      */
     public final T get() throws InterruptedException, ExecutionException {
         return future.get();
@@ -606,6 +617,8 @@
      * {@inheritDoc}
      * <p>
      * Please refer to {@link #get} for more details.
+     *
+     * @throws CancellationException {@inheritDoc}
      */
     public final T get(long timeout, TimeUnit unit) throws InterruptedException,
             ExecutionException, TimeoutException {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/SwingWorker/6608234/CheckCancellationException.java	Sat Jun 09 13:33:35 2018 -0700
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
+
+import javax.swing.SwingWorker;
+
+/**
+ * @test
+ * @bug 6608234
+ */
+public final class CheckCancellationException {
+
+    private static final CountDownLatch go = new CountDownLatch(1);
+
+    public static void main(final String[] args) throws Exception {
+        SwingWorker<?, ?> worker = new SwingWorker() {
+            protected Void doInBackground() {
+                go.countDown();
+                while (!Thread.interrupted()) ;
+                return null;
+            }
+        };
+        worker.execute();
+        go.await();
+        worker.cancel(true);
+        try {
+            worker.get();
+        } catch (final CancellationException expected) {
+            // expected exception
+            return;
+        }
+        throw new RuntimeException("CancellationException was not thrown");
+    }
+}