Mercurial > hg > openjdk > jdk8u > jdk
changeset 11223:2bae9d627eb8 jdk8u72-b05
Merge
| author | robm |
|---|---|
| date | Thu, 22 Oct 2015 22:48:13 +0100 |
| parents | 4f5158a20e5f (current diff) 9e9d9cac1ee5 (diff) |
| children | 39baa472e20c 6bf37c9c0871 |
| files | |
| diffstat | 14 files changed, 701 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java Wed Oct 21 11:35:44 2015 -0700 +++ b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java Thu Oct 22 22:48:13 2015 +0100 @@ -1,3 +1,4 @@ + /* * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,11 +30,12 @@ import java.awt.image.*; import java.io.*; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.text.Normalizer; import java.text.Normalizer.Form; import java.util.*; -import java.util.regex.*; import java.awt.datatransfer.*; import sun.awt.datatransfer.*; @@ -128,18 +130,34 @@ if (format == CF_URL && URL.class.equals(flavor.getRepresentationClass())) { - String charset = getDefaultTextCharset(); - if (transferable != null && transferable.isDataFlavorSupported(javaTextEncodingFlavor)) { - try { - charset = new String((byte[]) transferable.getTransferData(javaTextEncodingFlavor), "UTF-8"); - } catch (UnsupportedFlavorException cannotHappen) { + String[] strings = dragQueryFile(bytes); + if(strings == null || strings.length == 0) { + return null; + } + return new URL(strings[0]); + } else if(isUriListFlavor(flavor)) { + // dragQueryFile works fine with files and url, + // it parses and extracts values from property list. + // maxosx always returns property list for + // CF_URL and CF_FILE + String[] strings = dragQueryFile(bytes); + if(strings == null) { + return null; + } + String separator = System.getProperty("line.separator"); + StringBuilder sb = new StringBuilder(); + if(strings.length > 0) { + sb.append(strings[0]); + for(int i = 1; i < strings.length; i++) { + sb.append(strings[i]); + sb.append(separator); } } - - String xml = new String(bytes, charset); - // macosx pastboard returns a propery list that contins of one URL - // let's extract it. - return new URL(extractURL(xml)); + bytes = sb.toString().getBytes(); + // now we extracted uri from xml, now we should treat it as + // regular string that allows to translate data to target represantation + // class by base method + format = CF_STRING; } else if (format == CF_STRING) { bytes = Normalizer.normalize(new String(bytes, "UTF8"), Form.NFC).getBytes("UTF8"); } @@ -147,31 +165,6 @@ return super.translateBytes(bytes, flavor, format, transferable); } - /** - * Macosx pastboard returns xml document that contains one URL, for exmple: - * <pre> - * {@code - * <?xml version=\"1.0\" encoding=\"UTF-8\"?> - * <!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> - * <plist version=\"1.0\"> - * <array> - * <string>file:///Users/mcherkas/Downloads/Version.jpg</string> - * <string></string> - * </array> - * </plist> - * } - * </pre> - */ - private String extractURL(String xml) { - Pattern urlExtractorPattern = Pattern.compile("<string>(.*)</string>"); - Matcher matcher = urlExtractorPattern.matcher(xml); - if(matcher.find()){ - return matcher.group(1); - } else { - return null; - } - } - @Override synchronized protected Long getFormatForNativeAsLong(String str) { Long format = predefinedClipboardNameMap.get(str); @@ -247,6 +240,7 @@ return nativeDragQueryFile(bytes); } + @Override protected Image platformImageBytesToImage(byte[] bytes, long format) throws IOException { return CImage.getCreator().createImageFromPlatformImageBytes(bytes); @@ -271,7 +265,7 @@ } try { DataFlavor df = new DataFlavor(nat); - if (df.getPrimaryType().equals("text") && df.getSubType().equals("uri-list")) { + if (isUriListFlavor(df)) { return true; } } catch (Exception e) { @@ -279,6 +273,13 @@ } return false; } + + private boolean isUriListFlavor(DataFlavor df) { + if (df.getPrimaryType().equals("text") && df.getSubType().equals("uri-list")) { + return true; + } + return false; + } }
--- a/src/macosx/lib/flavormap.properties Wed Oct 21 11:35:44 2015 -0700 +++ b/src/macosx/lib/flavormap.properties Thu Oct 22 22:48:13 2015 +0100 @@ -80,5 +80,6 @@ RICH_TEXT=text/rtf HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1 URL=application/x-java-url;class=java.net.URL +FILE_NAME=text/uri-list;eoln="\r\n";terminators=1 URL=text/uri-list;eoln="\r\n";terminators=1 XPICT=image/x-pict;class=java.io.InputStream
--- a/src/share/classes/java/util/zip/Deflater.java Wed Oct 21 11:35:44 2015 -0700 +++ b/src/share/classes/java/util/zip/Deflater.java Thu Oct 22 22:48:13 2015 +0100 @@ -318,7 +318,9 @@ * should be called in order to provide more input */ public boolean needsInput() { - return len <= 0; + synchronized (zsRef) { + return len <= 0; + } } /**
--- a/src/share/classes/java/util/zip/ZStreamRef.java Wed Oct 21 11:35:44 2015 -0700 +++ b/src/share/classes/java/util/zip/ZStreamRef.java Thu Oct 22 22:48:13 2015 +0100 @@ -31,7 +31,7 @@ class ZStreamRef { - private long address; + private volatile long address; ZStreamRef (long address) { this.address = address; }
--- a/src/share/classes/java/util/zip/ZipFile.java Wed Oct 21 11:35:44 2015 -0700 +++ b/src/share/classes/java/util/zip/ZipFile.java Thu Oct 22 22:48:13 2015 +0100 @@ -58,7 +58,7 @@ */ public class ZipFile implements ZipConstants, Closeable { - private long jzfile; // address of jzfile data + private long jzfile; // address of jzfile data private final String name; // zip file name private final int total; // total number of entries private final boolean locsig; // if zip file starts with LOCSIG (usually true) @@ -685,7 +685,7 @@ * (possibly compressed) zip file entry. */ private class ZipFileInputStream extends InputStream { - private volatile boolean closeRequested = false; + private volatile boolean zfisCloseRequested = false; protected long jzentry; // address of jzentry data private long pos; // current position within entry data protected long rem; // number of remaining bytes within entry @@ -712,6 +712,7 @@ len = (int) rem; } + // Check if ZipFile open ensureOpenOrZipException(); len = ZipFile.read(ZipFile.this.jzfile, jzentry, pos, b, off, len); @@ -755,9 +756,9 @@ } public void close() { - if (closeRequested) + if (zfisCloseRequested) return; - closeRequested = true; + zfisCloseRequested = true; rem = 0; synchronized (ZipFile.this) {
--- a/src/share/native/java/util/zip/zip_util.c Wed Oct 21 11:35:44 2015 -0700 +++ b/src/share/native/java/util/zip/zip_util.c Thu Oct 22 22:48:13 2015 +0100 @@ -1314,12 +1314,23 @@ jint ZIP_Read(jzfile *zip, jzentry *entry, jlong pos, void *buf, jint len) { - jlong entry_size = (entry->csize != 0) ? entry->csize : entry->size; + jlong entry_size; jlong start; + if (zip == 0) { + return -1; + } + /* Clear previous zip error */ zip->msg = NULL; + if (entry == 0) { + zip->msg = "ZIP_Read: jzentry is NULL"; + return -1; + } + + entry_size = (entry->csize != 0) ? entry->csize : entry->size; + /* Check specified position */ if (pos < 0 || pos > entry_size - 1) { zip->msg = "ZIP_Read: specified offset out of range"; @@ -1451,6 +1462,11 @@ char *msg; char tmpbuf[1024]; + if (entry == 0) { + jio_fprintf(stderr, "jzentry was invalid"); + return JNI_FALSE; + } + strcpy(entryname, entry->name); if (entry->csize == 0) { /* Entry is stored */
--- a/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Wed Oct 21 11:35:44 2015 -0700 +++ b/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Thu Oct 22 22:48:13 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, 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 @@ -114,8 +114,9 @@ // which may've been disposed by this time, and we have // no means of checking against it. if (oldhDC != NULL) { - MoveDCToPassiveList(oldhDC); + MoveDCToPassiveList(oldhDC, info->hWnd); info->hDC = NULL; + info->hWnd = NULL; } if (wsdo->window != NULL){ @@ -150,6 +151,7 @@ // Finally, set these new values in the info for this thread info->hDC = hDC; + info->hWnd = wsdo->window; } // cached brush and pen are not associated with any DC, and can be @@ -187,7 +189,7 @@ if (info->hDC != NULL) { // move the DC from the active dcs list to // the passive dc list to be released later - MoveDCToPassiveList(info->hDC); + MoveDCToPassiveList(info->hDC, info->hWnd); } if (info->clip != NULL) {
--- a/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h Wed Oct 21 11:35:44 2015 -0700 +++ b/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h Thu Oct 22 22:48:13 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, 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 @@ -196,6 +196,7 @@ */ typedef struct { HDC hDC; + HWND hWnd; GDIWinSDOps *wsdo; LONG wsdoTimeStamp; // wsdo creation time stamp. // Other threads may deallocate wsdo
--- a/src/windows/native/sun/windows/awt_Component.cpp Wed Oct 21 11:35:44 2015 -0700 +++ b/src/windows/native/sun/windows/awt_Component.cpp Thu Oct 22 22:48:13 2015 +0100 @@ -1382,7 +1382,7 @@ case WM_AWT_RELEASEDC: { HDC hDC = (HDC)wParam; - MoveDCToPassiveList(hDC); + MoveDCToPassiveList(hDC, GetHWnd()); ReleaseDCList(GetHWnd(), passiveDCList); mr = mrConsume; break; @@ -7174,8 +7174,8 @@ } /** - * Given a DC, remove it from the DC list and return - * TRUE if it exists on the current list. Otherwise + * Given a DC and window handle, remove the DC from the DC list + * and return TRUE if it exists on the current list. Otherwise * return FALSE. * A DC may not exist on the list because it has already * been released elsewhere (for example, the window @@ -7183,14 +7183,14 @@ * thread may also want to release a DC when it notices that * its DC is obsolete for the current window). */ -DCItem *DCList::RemoveDC(HDC hDC) +DCItem *DCList::RemoveDC(HDC hDC, HWND hWnd) { listLock.Enter(); DCItem **prevPtrPtr = &head; DCItem *listPtr = head; while (listPtr) { DCItem *nextPtr = listPtr->next; - if (listPtr->hDC == hDC) { + if (listPtr->hDC == hDC && listPtr->hWnd == hWnd) { *prevPtrPtr = nextPtr; break; } @@ -7244,9 +7244,9 @@ listLock.Leave(); } -void MoveDCToPassiveList(HDC hDC) { +void MoveDCToPassiveList(HDC hDC, HWND hWnd) { DCItem *removedDC; - if ((removedDC = activeDCList.RemoveDC(hDC)) != NULL) { + if ((removedDC = activeDCList.RemoveDC(hDC, hWnd)) != NULL) { passiveDCList.AddDCItem(removedDC); } }
--- a/src/windows/native/sun/windows/awt_Component.h Wed Oct 21 11:35:44 2015 -0700 +++ b/src/windows/native/sun/windows/awt_Component.h Thu Oct 22 22:48:13 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -900,13 +900,13 @@ void AddDC(HDC hDC, HWND hWnd); void AddDCItem(DCItem *newItem); - DCItem *RemoveDC(HDC hDC); + DCItem *RemoveDC(HDC hDC, HWND hWnd); DCItem *RemoveAllDCs(HWND hWnd); void RealizePalettes(int screen); }; void ReleaseDCList(HWND hwnd, DCList &list); -void MoveDCToPassiveList(HDC hDC); +void MoveDCToPassiveList(HDC hDC, HWND hWnd); namespace TimeHelper{ jlong getMessageTimeUTC();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java Thu Oct 22 22:48:13 2015 +0100 @@ -0,0 +1,368 @@ +/* + * Copyright (c) 2015, 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. + */ + +/* + @test + @bug 8081787 8136763 + @author Mikhail Cherkasov + @run main/manual MacOsXFileAndMultipleFileCopingTest +*/ + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.net.URL; + +public class MacOsXFileAndMultipleFileCopingTest { + private static void init() { + String[] instructions = + {"Test for MacOS X only:", + "1. The aim is to test that java works fine with \"application/" + + "x-java-url;class=java.net.URL\"falvor and support coping of multiple files", + "2. Open finder and select any file.", + "3. Press CMD+C or press \"Copy\" in context menu", + "4. Focus window with \"Test URL\" Button.", + "5. If you see URL for selected file, then test PASSED,", + "otherwise test FAILED.", + + "6. Open finder again and select several files.", + "7. Press CMD+C or press \"Copy\" in context menu", + "8. Focus window with \"Test multiple files coping\" Button.", + "9. If you see list of selected files, then test PASSED,", + "otherwise test FAILED.", + + }; + + Sysout.createDialog(); + Sysout.printInstructions(instructions); + + final Frame frame = new Frame(); + Panel panel = new Panel(); + panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); + + frame.add(panel); + Button testUrlBtn = new Button("Test URL"); + final TextArea textArea = new TextArea(5, 80); + testUrlBtn.addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent ae) { + try { + Clipboard board = Toolkit.getDefaultToolkit().getSystemClipboard(); + URL url = (URL) board.getData(new DataFlavor("application/x-java-url;class=java.net.URL")); + textArea.setText(url.toString()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + panel.add(testUrlBtn); + Button testUriList = new Button("Test multiple files coping"); + testUriList.addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent ae) { + try { + Clipboard board = Toolkit.getDefaultToolkit().getSystemClipboard(); + String files = (String) board.getData(new DataFlavor("text/uri-list;class=java.lang.String")); + textArea.setText(files); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + panel.add(testUriList); + panel.add(textArea); + frame.setBounds(200, 200, 400, 400); + frame.setVisible(true); + + }//End init() + + + /***************************************************** + * Standard Test Machinery Section + * DO NOT modify anything in this section -- it's a + * standard chunk of code which has all of the + * synchronisation necessary for the test harness. + * By keeping it the same in all tests, it is easier + * to read and understand someone else's test, as + * well as insuring that all tests behave correctly + * with the test harness. + * There is a section following this for test-defined + * classes + ******************************************************/ + private static boolean theTestPassed = false; + private static boolean testGeneratedInterrupt = false; + private static String failureMessage = ""; + + private static Thread mainThread = null; + + private static int sleepTime = 300000; + + public static void main(String args[]) throws InterruptedException { + if (!System.getProperty("os.name").startsWith("Mac")) { + return; + } + mainThread = Thread.currentThread(); + try { + init(); + } catch (TestPassedException e) { + //The test passed, so just return from main and harness will + // interepret this return as a pass + return; + } + //At this point, neither test passed nor test failed has been + // called -- either would have thrown an exception and ended the + // test, so we know we have multiple threads. + + //Test involves other threads, so sleep and wait for them to + // called pass() or fail() + try { + Thread.sleep(sleepTime); + //Timed out, so fail the test + throw new RuntimeException("Timed out after " + sleepTime / 1000 + " seconds"); + } catch (InterruptedException e) { + if (!testGeneratedInterrupt) throw e; + + //reset flag in case hit this code more than once for some reason (just safety) + testGeneratedInterrupt = false; + if (theTestPassed == false) { + throw new RuntimeException(failureMessage); + } + } + + }//main + + public static synchronized void setTimeoutTo(int seconds) { + sleepTime = seconds * 1000; + } + + public static synchronized void pass() { + Sysout.println("The test passed."); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //first check if this is executing in main thread + if (mainThread == Thread.currentThread()) { + //Still in the main thread, so set the flag just for kicks, + // and throw a test passed exception which will be caught + // and end the test. + theTestPassed = true; + throw new TestPassedException(); + } + //pass was called from a different thread, so set the flag and interrupt + // the main thead. + theTestPassed = true; + testGeneratedInterrupt = true; + if (mainThread != null) { + mainThread.interrupt(); + } + }//pass() + + public static synchronized void fail() { + //test writer didn't specify why test failed, so give generic + fail("it just plain failed! :-)"); + } + + public static synchronized void fail(String whyFailed) { + Sysout.println("The test failed: " + whyFailed); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //check if this called from main thread + if (mainThread == Thread.currentThread()) { + //If main thread, fail now 'cause not sleeping + throw new RuntimeException(whyFailed); + } + theTestPassed = false; + testGeneratedInterrupt = true; + failureMessage = whyFailed; + mainThread.interrupt(); + }//fail() + +}// class ManualMainTest + +//This exception is used to exit from any level of call nesting +// when it's determined that the test has passed, and immediately +// end the test. +class TestPassedException extends RuntimeException { +} + +//*********** End Standard Test Machinery Section ********** + + +/**************************************************** + * Standard Test Machinery + * DO NOT modify anything below -- it's a standard + * chunk of code whose purpose is to make user + * interaction uniform, and thereby make it simpler + * to read and understand someone else's test. + ****************************************************/ + +/** + This is part of the standard test machinery. + It creates a dialog (with the instructions), and is the interface + for sending text messages to the user. + To print the instructions, send an array of strings to Sysout.createDialog + WithInstructions method. Put one line of instructions per array entry. + To display a message for the tester to see, simply call Sysout.println + with the string to be displayed. + This mimics System.out.println but works within the test harness as well + as standalone. + */ + +class Sysout { + private static TestDialog dialog; + private static boolean numbering = false; + private static int messageNumber = 0; + + public static void createDialogWithInstructions(String[] instructions) { + dialog = new TestDialog(new Frame(), "Instructions"); + dialog.printInstructions(instructions); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void createDialog() { + dialog = new TestDialog(new Frame(), "Instructions"); + String[] defInstr = {"Instructions will appear here. ", ""}; + dialog.printInstructions(defInstr); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + + /* Enables message counting for the tester. */ + public static void enableNumbering(boolean enable) { + numbering = enable; + } + + public static void printInstructions(String[] instructions) { + dialog.printInstructions(instructions); + } + + + public static void println(String messageIn) { + if (numbering) { + messageIn = "" + messageNumber + " " + messageIn; + messageNumber++; + } + dialog.displayMessage(messageIn); + } + +}// Sysout class + +/** + This is part of the standard test machinery. It provides a place for the + test instructions to be displayed, and a place for interactive messages + to the user to be displayed. + To have the test instructions displayed, see Sysout. + To have a message to the user be displayed, see Sysout. + Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog implements ActionListener { + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + Panel buttonP = new Panel(); + Button passB = new Button("pass"); + Button failB = new Button("fail"); + + //DO NOT call this directly, go through Sysout + public TestDialog(Frame frame, String name) { + super(frame, name); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea("", 15, maxStringLength, scrollBoth); + add("North", instructionsText); + + messageText = new TextArea("", 5, maxStringLength, scrollBoth); + add("Center", messageText); + + passB = new Button("pass"); + passB.setActionCommand("pass"); + passB.addActionListener(this); + buttonP.add("East", passB); + + failB = new Button("fail"); + failB.setActionCommand("fail"); + failB.addActionListener(this); + buttonP.add("West", failB); + + add("South", buttonP); + pack(); + + setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions(String[] instructions) { + //Clear out any current instructions + instructionsText.setText(""); + + //Go down array of instruction strings + + String printStr, remainingStr; + for (int i = 0; i < instructions.length; i++) { + //chop up each into pieces maxSringLength long + remainingStr = instructions[i]; + while (remainingStr.length() > 0) { + //if longer than max then chop off first max chars to print + if (remainingStr.length() >= maxStringLength) { + //Try to chop on a word boundary + int posOfSpace = remainingStr. + lastIndexOf(' ', maxStringLength - 1); + + if (posOfSpace <= 0) posOfSpace = maxStringLength - 1; + + printStr = remainingStr.substring(0, posOfSpace + 1); + remainingStr = remainingStr.substring(posOfSpace + 1); + } + //else just print + else { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append(printStr + "\n"); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage(String messageIn) { + messageText.append(messageIn + "\n"); + System.out.println(messageIn); + } + + //catch presses of the passed and failed buttons. + //simply call the standard pass() or fail() static methods of + //ManualMainTest + public void actionPerformed(ActionEvent e) { + if (e.getActionCommand() == "pass") { + MacOsXFileAndMultipleFileCopingTest.pass(); + } else { + MacOsXFileAndMultipleFileCopingTest.fail(); + } + } + +}// TestDialog class \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/util/zip/ZipFile/ZipEntryFreeTest.java Thu Oct 22 22:48:13 2015 +0100 @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2015, 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. + */ + +/* @test + * @bug 6907252 + * @summary ZipFileInputStream Not Thread-Safe + * @library /lib/testlibrary + * @build jdk.testlibrary.* + * @run main ZipEntryFreeTest + */ + +import java.io.*; +import java.nio.file.Paths; +import java.util.Random; +import java.util.Timer; +import java.util.TimerTask; +import java.util.zip.*; +import jdk.testlibrary.FileUtils; + +public class ZipEntryFreeTest extends Thread { + + private static final int NUM_THREADS = 5; + private static final int TEST_ITERATIONS = 5; + private static final String ZIPFILE_NAME = "large.zip"; + private static final String ZIPENTRY_NAME = "random.txt"; + private static InputStream is = null; + final Timer timer = new Timer(); + + public static void main(String args[]) throws Exception { + createZipFile(); + try { + for (int i = 0; i < TEST_ITERATIONS; i++) { + runTest(); + } + } finally { + FileUtils.deleteFileIfExistsWithRetry(Paths.get(ZIPFILE_NAME)); + } + } + + private static void runTest() throws Exception { + try (ZipFile zf = new ZipFile(new File(ZIPFILE_NAME))) { + is = zf.getInputStream(zf.getEntry(ZIPENTRY_NAME + "_0")); + Thread[] threadArray = new Thread[NUM_THREADS]; + for (int i = 0; i < threadArray.length; i++) { + threadArray[i] = new ZipEntryFreeTest(); + } + for (int i = 0; i < threadArray.length; i++) { + threadArray[i].start(); + } + for (int i = 0; i < threadArray.length; i++) { + threadArray[i].join(); + } + } + } + + private static void createZipFile() throws Exception { + Random rnd = new Random(1000L); + byte[] contents = new byte[2_000_000]; + ZipEntry ze = null; + + try (ZipOutputStream zos = + new ZipOutputStream(new FileOutputStream(ZIPFILE_NAME))) { + // uncompressed mode seemed to tickle the crash + zos.setMethod(ZipOutputStream.STORED); + for (int ze_count = 0; ze_count < 10; ze_count++) { + rnd.nextBytes(contents); + ze = createZipEntry(contents, ze_count); + zos.putNextEntry(ze); + zos.write(contents, 0, contents.length); + } + zos.flush(); + } + } + + private static ZipEntry createZipEntry(byte[] b, int i) { + ZipEntry ze = new ZipEntry(ZIPENTRY_NAME + "_" + i); + ze.setCompressedSize(b.length); + ze.setSize(b.length); + CRC32 crc = new CRC32(); + crc.update(b); + ze.setCrc(crc.getValue()); + return ze; + } + + @Override + public void run() { + try { + int iteration = 0; + TimerTask tt = (new TimerTask() { + @Override + public void run() { + try { + is.close(); + } catch (Exception ex) { + ex.printStackTrace(System.out); + } + } + }); + timer.schedule(tt, 50); + while (is.read() != -1 && iteration++ < 1_000) { } + } catch (ZipException ze) { + // ZipException now expected instead of ZIP_Read crash + System.out.println(ze); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + timer.cancel(); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/xml/bind/jxc/8073519/InputWithError.java Thu Oct 22 22:48:13 2015 +0100 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2015, 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 javax.xml.bind.annotation.XmlType; + +@XmlType +public class InputWithError { + public int a; + int compile-error; +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java Thu Oct 22 22:48:13 2015 +0100 @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2015, 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. + */ + +/* + * @test + * @bug 8073519 + * @summary test that schemagen tool reports errors during + * xsd generation process + * @library /lib/testlibrary + * @run testng/othervm SchemagenErrorReporting + */ +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.Arrays; +import java.util.stream.Collectors; +import jdk.testlibrary.JDKToolLauncher; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class SchemagenErrorReporting { + + @Test + public void schemagenErrorReporting() throws Exception { + //schemagen tool output file name + final String SCHEMA_FILE = "schema1.xsd"; + //Schemagen input java file with not compilable source + final String CLASS_FILE = "InputWithError.java"; + //Test working, src directories and test output file + Path testWorkDir, testSrcDir, testOutput; + + //Prepare test environment + //Create test directory inside scratch + testWorkDir = Paths.get(System.getProperty("user.dir", ".")) + .resolve("SchemagenErrorReporting"); + //Get test source directory + testSrcDir = Paths.get(System.getProperty("test.src", ".")); + //Set test output file path + testOutput = testWorkDir.resolve("stdErrContent"); + //Create test directory inside scratch directory + Files.createDirectory(testWorkDir); + //Copy java source from test.src to the test directory + Files.copy(testSrcDir.resolve(CLASS_FILE), testWorkDir.resolve(CLASS_FILE), + StandardCopyOption.REPLACE_EXISTING); + + //Prepare process builder to run schemagen tool and save its output + JDKToolLauncher sgl = JDKToolLauncher.createUsingTestJDK("schemagen"); + sgl.addToolArg(CLASS_FILE); + System.out.println("Executing: " + Arrays.asList(sgl.getCommand())); + ProcessBuilder pb = new ProcessBuilder(sgl.getCommand()); + //Set schemagen work directory with the input java file + pb.directory(testWorkDir.toFile()); + //Redirect schemagen output to file + pb.redirectError(testOutput.toFile()); + Process p = pb.start(); + int result = p.waitFor(); + p.destroy(); + + //Read schemagen output from the file + String stdErrContent = Files.lines(testOutput) + .collect(Collectors.joining(System.lineSeparator(), System.lineSeparator(), "")); + System.out.println("Schemagen return value:" + result); + System.out.println("Error output:" + stdErrContent); + //Check test results: + //Schemagen finished with non-0 return value + Assert.assertNotEquals(result, 0); + //Schemagen output contains compile error message + Assert.assertTrue(stdErrContent.contains("InputWithError.java:28: error")); + } +}