Mercurial > hg > release > icedtea7-2.5
view patches/boot/ecj-trywithresources.patch @ 2764:5ecf54fa7dcd
Bump to icedtea-2.5.4.
S6461635: [TESTBUG] BasicTests.sh test fails intermittently
S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
S7183753: [TEST] Some colon in the diff for this test
S8025051: Update resource files for TimeZone display names
S8031046: Native Windows ccache might still get unsupported ticket
S8040617: [macosx] Large JTable cell results in a OutOfMemoryException
S8041572: [macosx] huge native memory leak in AWTWindow.m
S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser
S8043610: Sorting columns in JFileChooser fails with AppContext NPE
S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
S8046656: Update protocol support
S8047125, CVE-2015-0395: (ref) More phantom object references
S8047130: Fewer escapes from escape analysis
S8048035, CVE-2015-0400: Ensure proper proxy protocols
S8049250: Need a flag to invert the Card.disconnect(reset) argument
S8049253: Better GC validation
S8049343: (tz) Support tzdata2014g
S8049758: Increment minor version of HSx for 7u75 and initialize the build number
S8050807, CVE-2015-0383: Better performing performance data handling
S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE
S8051614: smartcardio TCK tests fail due to lack of 'reset' permission
S8054367, CVE-2015-0412: More references for endpoints
S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel
S8055309, CVE-2015-0408: RMI needs better transportation considerations
S8055479: TLAB stability
S8055489, CVE-2014-6585: Better substitution formats
S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure
S8056264, CVE-2014-6587: Multicast support improvements
S8056276, CVE-2014-6591: Fontmanager feature improvements
S8057555, CVE-2014-6593: Less cryptic cipher suite management
S8058715: stability issues when being launched as an embedded JVM via JNI
S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial
S8059206: (tz) Support tzdata2014i
S8059485, CVE-2015-0410: Resolve parsing ambiguity
S8060474: Resolve more parsing ambiguity
S8061210, CVE-2014-3566: Issues in TLS
S8061685: Increment hsx 24.75 build to b02 for 7u75-b06
S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
S8061826: Part of JDK-8060474 should be reverted
S8062561: Test bug8055304 fails if file system default directory has read access
S8062807: Exporting RMI objects fails when run under restrictive SecurityManager
S8064300: Increment hsx 24.75 build to b03 for 7u75-b06
S8064560: (tz) Support tzdata2014j
S8065608: 7u75 l10n resource file translation update
S8065787: Increment hsx 24.75 build to b04 for 7u75-b10
S8066747: Backing out Japanese translation change in awt_ja.properties
2015-01-20 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 75.
(BUILD_VERSION): Bump to b13.
(CORBA_CHANGESET): Update to icedtea-2.5.4.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.5.4.
* hotspot.map.in: Update to icedtea-2.5.4.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new cases introduced in
sun.security.ssl.ProtocolVersion and
sun.security.ssl.SSLContextImpl
* patches/boot/ecj-trywithresources.patch:
Add new case in
sun.security.krb5.internal.ccache.FileCredentialsCache.
Change is taken from the OpenJDK 6 version of
the file.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 21 Jan 2015 03:46:59 +0000 |
| parents | 579668bd82f7 |
| children |
line wrap: on
line source
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-04-18 05:14:39.879715441 +0100 @@ -743,7 +743,9 @@ private void dumpBand() throws IOException { assert(optDumpBands); - try (PrintStream ps = new PrintStream(getDumpStream(this, ".txt"))) { + PrintStream ps = null; + try { + ps = new PrintStream(getDumpStream(this, ".txt")); String irr = (bandCoding == regularCoding) ? "" : " irregular"; ps.print("# length="+length+ " size="+outputSize()+ @@ -758,9 +760,19 @@ } printArrayTo(ps, values, 0, length); } - try (OutputStream ds = getDumpStream(this, ".bnd")) { + finally { + if (ps != null) + ps.close(); + } + OutputStream ds = null; + try { + ds = getDumpStream(this, ".bnd"); bandCoding.writeArrayTo(ds, values, 0, length); } + finally { + if (ds != null) + ds.close(); + } } /** Disburse one value. */ @@ -829,12 +841,18 @@ private void dumpBand() throws IOException { assert(optDumpBands); - try (OutputStream ds = getDumpStream(this, ".bnd")) { + OutputStream ds = null; + try { + ds = getDumpStream(this, ".bnd"); if (bytesForDump != null) bytesForDump.writeTo(ds); else bytes.writeTo(ds); } + finally { + if (ds != null) + ds.close(); + } } public void readDataFrom(InputStream in) throws IOException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-04-18 05:12:09.201488873 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-04-18 05:14:39.879715441 +0100 @@ -151,8 +151,13 @@ if ("--config-file=".equals(state)) { String propFile = av.remove(0); Properties fileProps = new Properties(); - try (InputStream propIn = new FileInputStream(propFile)) { + InputStream propIn = null; + try { + propIn = new FileInputStream(propFile); fileProps.load(propIn); + } finally { + if (propIn != null) + propIn.close(); } if (engProps.get(verboseProp) != null) fileProps.list(System.out); @@ -343,9 +348,14 @@ else fileOut = new FileOutputStream(outfile); fileOut = new BufferedOutputStream(fileOut); - try (JarOutputStream out = new JarOutputStream(fileOut)) { + JarOutputStream out = null; + try { + out = new JarOutputStream(fileOut); junpack.unpack(in, out); // p200 closes in but not out + } finally { + if (out != null) + out.close(); } // At this point, we have a good jarfile (or newfile, if -r) } @@ -407,7 +417,9 @@ long filelen = new File(jarfile).length(); if (filelen <= 0) return ""; long skiplen = Math.max(0, filelen - tail.length); - try (InputStream in = new FileInputStream(new File(jarfile))) { + InputStream in = null; + try { + in = new FileInputStream(new File(jarfile)); in.skip(skiplen); in.read(tail); for (int i = tail.length-4; i >= 0; i--) { @@ -421,6 +433,9 @@ } } return ""; + } finally { + if (in != null) + in.close(); } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2014-04-18 05:14:39.883715500 +0100 @@ -245,9 +245,15 @@ void run(File inFile, JarOutputStream jstream) throws IOException { // %%% maybe memory-map the file, and pass it straight into unpacker ByteBuffer mappedFile = null; - try (FileInputStream fis = new FileInputStream(inFile)) { + FileInputStream fis = null; + try { + fis = new FileInputStream(inFile); run(fis, jstream, mappedFile); } + finally { + if (fis != null) + fis.close(); + } // Note: caller is responsible to finish with jstream. } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-04-18 05:14:39.883715500 +0100 @@ -540,9 +540,15 @@ Index index = initCPIndex(tag, cpMap); if (optDumpBands) { - try (PrintStream ps = new PrintStream(getDumpStream(index, ".idx"))) { + PrintStream ps = null; + try { + ps = new PrintStream(getDumpStream(index, ".idx")); printArrayTo(ps, index.cpMap, 0, index.cpMap.length); } + finally { + if (ps != null) + ps.close(); + } } } @@ -828,9 +834,10 @@ attr_definition_headers.readFrom(in); attr_definition_name.readFrom(in); attr_definition_layout.readFrom(in); - try (PrintStream dump = !optDumpBands ? null - : new PrintStream(getDumpStream(attr_definition_headers, ".def"))) - { + PrintStream dump = null; + try { + dump = !optDumpBands ? null + : new PrintStream(getDumpStream(attr_definition_headers, ".def")); for (int i = 0; i < numAttrDefs; i++) { int header = attr_definition_headers.getByte(); Utf8Entry name = (Utf8Entry) attr_definition_name.getRef(); @@ -849,6 +856,10 @@ if (dump != null) dump.println(index+" "+def); } } + finally { + if (dump != null) + dump.close(); + } attr_definition_headers.doneDisbursing(); attr_definition_name.doneDisbursing(); attr_definition_layout.doneDisbursing(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-04-18 05:14:39.883715500 +0100 @@ -458,9 +458,15 @@ Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries..."); if (optDumpBands) { - try (PrintStream ps = new PrintStream(getDumpStream(index, ".idx"))) { + PrintStream ps = null; + try { + ps = new PrintStream(getDumpStream(index, ".idx")); printArrayTo(ps, cpMap, 0, cpMap.length); } + finally { + if (ps != null) + ps.close(); + } } switch (tag) { @@ -923,9 +929,10 @@ } }); attrDefsWritten = new Attribute.Layout[numAttrDefs]; - try (PrintStream dump = !optDumpBands ? null - : new PrintStream(getDumpStream(attr_definition_headers, ".def"))) - { + PrintStream dump = null; + try { + dump = !optDumpBands ? null + : new PrintStream(getDumpStream(attr_definition_headers, ".def")); int[] indexForDebug = Arrays.copyOf(attrIndexLimit, ATTR_CONTEXT_LIMIT); for (int i = 0; i < defs.length; i++) { int header = ((Integer)defs[i][0]).intValue(); @@ -951,6 +958,10 @@ } } } + finally { + if (dump != null) + dump.close(); + } } void writeAttrCounts() throws IOException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-04-18 05:14:39.883715500 +0100 @@ -123,8 +123,9 @@ // Do this after the previous props are put in place, // to allow override if necessary. String propFile = "intrinsic.properties"; - - try (InputStream propStr = PackerImpl.class.getResourceAsStream(propFile)) { + InputStream propStr = null; + try { + propStr = PackerImpl.class.getResourceAsStream(propFile); if (propStr == null) { throw new RuntimeException(propFile + " cannot be loaded"); } @@ -132,6 +133,14 @@ } catch (IOException ee) { throw new RuntimeException(ee); } + finally { + try { + if (propStr != null) + propStr.close(); + } catch (IOException ee) { + throw new RuntimeException(ee); + } + } for (Map.Entry<Object, Object> e : props.entrySet()) { String key = (String) e.getKey(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-04-18 05:14:39.883715500 +0100 @@ -161,9 +161,15 @@ } // Use the stream-based implementation. // %%% Reconsider if native unpacker learns to memory-map the file. - try (FileInputStream instr = new FileInputStream(in)) { + FileInputStream instr = null; + try { + instr = new FileInputStream(in); unpack(instr, out); } + finally { + if (instr != null) + instr.close(); + } if (props.getBoolean(Utils.UNPACK_REMOVE_PACKFILE)) { in.delete(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-04-18 05:14:39.883715500 +0100 @@ -268,18 +268,30 @@ // 4947205 : Peformance is slow when using pack-effort=0 out = new BufferedOutputStream(out); out = new NonCloser(out); // protect from JarOutputStream.close() - try (JarOutputStream jout = new JarOutputStream(out)) { + JarOutputStream jout = null; + try { + jout = new JarOutputStream(out); copyJarFile(in, jout); } + finally { + if (jout != null) + jout.close(); + } } static void copyJarFile(JarFile in, OutputStream out) throws IOException { // 4947205 : Peformance is slow when using pack-effort=0 out = new BufferedOutputStream(out); out = new NonCloser(out); // protect from JarOutputStream.close() - try (JarOutputStream jout = new JarOutputStream(out)) { + JarOutputStream jout = null; + try { + jout = new JarOutputStream(out); copyJarFile(in, jout); } + finally { + if (jout != null) + jout.close(); + } } // Wrapper to prevent closing of client-supplied stream. static private diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java --- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-04-18 05:14:39.883715500 +0100 @@ -914,10 +914,15 @@ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection(); int len = uconn.getContentLength(); byte[] bytes = new byte[len]; - try (java.io.InputStream str = uconn.getInputStream()) { + java.io.InputStream str = null; + try { + str = uconn.getInputStream(); int nr = str.read(bytes); if (nr != len) throw new java.io.IOException(tResource); - } + } finally { + if (str != null) + str.close(); + } values[0] = bytes; } catch (java.io.IOException ex) { throw newInternalError(ex); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java --- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2014-04-18 05:14:39.883715500 +0100 @@ -578,12 +578,23 @@ * Returns the Manifest for the specified JAR file name. */ private static Manifest loadManifest(String fn) { - try (FileInputStream fis = new FileInputStream(fn); - JarInputStream jis = new JarInputStream(fis, false)) - { + FileInputStream fis = null; + JarInputStream jis = null; + try { + fis = new FileInputStream(fn); + jis = new JarInputStream(fis, false); return jis.getManifest(); } catch (IOException e) { return null; + } finally { + try { + if (jis != null) + jis.close(); + if (fis != null) + fis.close(); + } catch (IOException e) { + return null; + } } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java --- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2014-04-18 05:14:39.883715500 +0100 @@ -188,7 +188,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); } - throw x; + throw (IOException) x; } assert sc.isConnected(); return sc; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java --- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2014-04-18 05:14:39.883715500 +0100 @@ -122,9 +122,15 @@ if (attrs.isDirectory()) { Files.createDirectory(target); } else { - try (InputStream in = Files.newInputStream(source)) { + InputStream in = null; + try { + in = Files.newInputStream(source); Files.copy(in, target); } + finally { + if (in != null) + in.close(); + } } // copy basic attributes to target @@ -142,7 +148,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); } - throw x; + throw (IOException) x; } } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java --- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2014-04-18 05:14:39.883715500 +0100 @@ -2850,8 +2850,11 @@ } // do the copy - try (OutputStream out = ostream) { - return copy(in, out); + try { + return copy(in, ostream); + } + finally { + ostream.close(); } } @@ -2892,9 +2895,15 @@ // ensure not null before opening file Objects.requireNonNull(out); - try (InputStream in = newInputStream(source)) { + InputStream in = null; + try { + in = newInputStream(source); return copy(in, out); } + finally { + if (in != null) + in.close(); + } } /** @@ -2978,14 +2987,27 @@ * method is invoked to check read access to the file. */ public static byte[] readAllBytes(Path path) throws IOException { - try (SeekableByteChannel sbc = Files.newByteChannel(path); - InputStream in = Channels.newInputStream(sbc)) { + SeekableByteChannel sbc = null; + InputStream in = null; + + try { + sbc = Files.newByteChannel(path); + in = Channels.newInputStream(sbc); long size = sbc.size(); if (size > (long)MAX_BUFFER_SIZE) throw new OutOfMemoryError("Required array size too large"); return read(in, (int)size); - } + } finally { + IOException e = null; + + if (in != null) + try { in.close(); } catch (IOException ex) { e = ex; } + if (sbc != null) + try { sbc.close(); } catch (IOException ex) { e = ex; } + + if (e != null) throw e; + } } /** @@ -3030,7 +3052,9 @@ public static List<String> readAllLines(Path path, Charset cs) throws IOException { - try (BufferedReader reader = newBufferedReader(path, cs)) { + BufferedReader reader = null; + try { + reader = newBufferedReader(path, cs); List<String> result = new ArrayList<>(); for (;;) { String line = reader.readLine(); @@ -3040,6 +3064,10 @@ } return result; } + finally { + if (reader != null) + reader.close(); + } } /** @@ -3089,7 +3117,9 @@ // ensure bytes is not null before opening file Objects.requireNonNull(bytes); - try (OutputStream out = Files.newOutputStream(path, options)) { + OutputStream out = null; + try { + out = Files.newOutputStream(path, options); int len = bytes.length; int rem = len; while (rem > 0) { @@ -3098,6 +3128,10 @@ rem -= n; } } + finally { + if (out != null) + out.close(); + } return path; } @@ -3149,12 +3183,18 @@ Objects.requireNonNull(lines); CharsetEncoder encoder = cs.newEncoder(); OutputStream out = newOutputStream(path, options); - try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, encoder))) { + BufferedWriter writer = null; + try { + writer = new BufferedWriter(new OutputStreamWriter(out, encoder)); for (CharSequence line: lines) { writer.append(line); writer.newLine(); } } + finally { + if (writer != null) + writer.close(); + } return path; } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java --- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2014-04-18 05:14:39.883715500 +0100 @@ -233,9 +233,14 @@ "currency.properties"); if (propFile.exists()) { Properties props = new Properties(); - try (FileReader fr = new FileReader(propFile)) { + FileReader fr = null; + try { + fr = new FileReader(propFile); props.load(fr); } + finally { + fr.close(); + } Set<String> keys = props.stringPropertyNames(); Pattern propertiesPattern = Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*([0-3])"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java --- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2014-04-18 05:14:39.883715500 +0100 @@ -386,9 +386,14 @@ * META-INF files. */ private byte[] getBytes(ZipEntry ze) throws IOException { - try (InputStream is = super.getInputStream(ze)) { + InputStream is = null; + try { + is = super.getInputStream(ze); return IOUtils.readFully(is, (int)ze.getSize(), true); - } + } finally { + if (is != null) + is.close(); + } } /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java --- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2014-04-18 05:14:39.883715500 +0100 @@ -144,8 +144,9 @@ buf = new char[(int)len]; int read = 0; int offset = 0; - - try (Reader charStream = clob.getCharacterStream()) { + Reader charStream = null; + try { + charStream = clob.getCharacterStream(); if (charStream == null) { throw new SQLException("Invalid Clob object. The call to getCharacterStream " + "returned null which cannot be serialized."); @@ -153,23 +154,41 @@ // Note: get an ASCII stream in order to null-check it, // even though we don't do anything with it. - try (InputStream asciiStream = clob.getAsciiStream()) { + InputStream asciiStream = null; + try { + asciiStream = clob.getAsciiStream(); if (asciiStream == null) { throw new SQLException("Invalid Clob object. The call to getAsciiStream " + "returned null which cannot be serialized."); } } - - try (Reader reader = new BufferedReader(charStream)) { + finally { + if (asciiStream != null) + asciiStream.close(); + } + Reader reader = null; + try { + reader = new BufferedReader(charStream); do { read = reader.read(buf, offset, (int)(len - offset)); offset += read; } while (read > 0); } + finally { + if (reader != null) + reader.close(); + } } catch (java.io.IOException ex) { throw new SerialException("SerialClob: " + ex.getMessage()); } - + finally { + try { + if (charStream != null) + charStream.close(); + } catch (java.io.IOException ex) { + throw new SerialException("SerialClob: " + ex.getMessage()); + } + } origLen = len; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java --- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-04-18 05:15:40.304608362 +0100 @@ -382,9 +382,15 @@ // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt ROWSET_PROPERTIES = strRowsetProperties; - try (FileInputStream fis = new FileInputStream(ROWSET_PROPERTIES)) { + FileInputStream fis = null; + try { + fis = new FileInputStream(ROWSET_PROPERTIES); properties.load(fis); } + finally { + if (fis != null) + fis.close(); + } parseProperties(properties); } @@ -401,13 +407,18 @@ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() { @Override public Void run() throws SyncFactoryException, IOException, FileNotFoundException { - try (InputStream stream = (cl == null) ? - ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES) - : cl.getResourceAsStream(ROWSET_PROPERTIES)) { + InputStream stream = null; + try { + stream = + (cl == null) ? ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES) + : cl.getResourceAsStream(ROWSET_PROPERTIES); if (stream == null) { throw new SyncFactoryException("Resource " + ROWSET_PROPERTIES + " not found"); } properties.load(stream); + } finally { + if (stream != null) + stream.close(); } return null; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java --- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-04-18 05:12:09.209488992 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-04-18 05:14:39.887715559 +0100 @@ -555,8 +555,9 @@ if (parent == null) { parent = new File("."); } - try (DirectoryStream<Path> dstream = - Files.newDirectoryStream(parent.toPath(), glob)) { + DirectoryStream<Path> dstream = null; + try { + dstream = Files.newDirectoryStream(parent.toPath(), glob); int entries = 0; for (Path p : dstream) { out.add(p.normalize().toString()); @@ -571,6 +572,9 @@ System.err.println("Warning: passing argument as-is " + a); System.err.print(e); } + } finally { + if (dstream != null) + try { dstream.close(); } catch (IOException e) {} } } else { out.add(a.arg); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java --- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2014-04-18 05:14:39.887715559 +0100 @@ -194,7 +194,8 @@ * Given a URL, retrieves a JAR file, caches it to disk, and creates a * cached JAR file object. */ - private static JarFile retrieve(final URL url, final URLJarFileCloseController closeController) throws IOException { + private static JarFile retrieve(final URL url, final URLJarFileCloseController closeController) + throws IOException { /* * See if interface is set, then call retrieve function of the class * that implements URLJarFileCallBack interface (sun.plugin - to @@ -211,7 +212,8 @@ JarFile result = null; /* get the stream before asserting privileges */ - try (final InputStream in = url.openConnection().getInputStream()) { + try { + final InputStream in = url.openConnection().getInputStream(); result = AccessController.doPrivileged( new PrivilegedExceptionAction<JarFile>() { public JarFile run() throws IOException { @@ -227,7 +229,10 @@ } catch (IOException ioe) { thr.addSuppressed(ioe); } - throw thr; + throw (IOException) thr; + } finally { + if (in != null) + in.close(); } } }); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java --- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2014-04-18 05:14:39.887715559 +0100 @@ -255,7 +255,9 @@ this.entries = new HashMap<Path,CacheEntry>(); // get the initial entries in the directory - try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) { + DirectoryStream<Path> stream = null; + try { + stream = Files.newDirectoryStream(dir); for (Path entry: stream) { // don't follow links long lastModified = @@ -264,6 +266,10 @@ } } catch (DirectoryIteratorException e) { throw e.getCause(); + } finally { + if (stream != null) { + stream.close(); + } } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java --- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-04-18 05:14:39.887715559 +0100 @@ -680,25 +680,38 @@ private void handleProcessFailure(final Process failedProcess, final String[] execCmd, final int result) throws IOException { - try (StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw)) { + StringWriter sw = null; + PrintWriter pw = null; + try { + sw = new StringWriter(); + pw = new PrintWriter(sw); pw.append("error=").append(Integer.toString(result)); pw.append(" running:"); for (String arg: execCmd) { pw.append(" '").append(arg).append("'"); } - try (InputStream is = failedProcess.getErrorStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr)) { + InputStream is = null; + InputStreamReader isr = null; + BufferedReader br = null; + try { + is = failedProcess.getErrorStream(); + isr = new InputStreamReader(is); + br = new BufferedReader(isr); while (br.ready()) { pw.println(); pw.append("\t\t").append(br.readLine()); } } finally { pw.flush(); + if (br != null) br.close(); + if (isr != null) isr.close(); + if (is != null) is.close(); throw new IOException(sw.toString()); } - } + } finally { + if (pw != null) pw.close(); + if (sw != null) sw.close(); + } } public Object run() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java --- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2014-04-18 05:14:39.887715559 +0100 @@ -594,10 +594,16 @@ } else { name = versionFile; } - try (FileOutputStream fos = new FileOutputStream(fName(name)); - DataOutputStream out = new DataOutputStream(fos)) { + FileOutputStream fos = null; + DataOutputStream out = null; + try { + fos = new FileOutputStream(fName(name)); + out = new DataOutputStream(fos); writeInt(out, version); - } + } finally { + if (out != null) out.close(); + if (fos != null) fos.close(); + } } /** @@ -628,10 +634,13 @@ * @exception IOException If an I/O error has occurred. */ private int readVersion(String name) throws IOException { - try (DataInputStream in = new DataInputStream - (new FileInputStream(name))) { + DataInputStream in = null; + try { + in = new DataInputStream(new FileInputStream(name)); return in.readInt(); - } + } finally { + if (in != null) in.close(); + } } /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java --- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-04-18 05:14:39.887715559 +0100 @@ -1233,13 +1233,16 @@ PipeWriter.plugTogetherPair (child.getInputStream(), System.out, child.getErrorStream(), System.err); - try (MarshalOutputStream out = - new MarshalOutputStream(child.getOutputStream())) { + MarshalOutputStream out = null; + try { + out = new MarshalOutputStream(child.getOutputStream()); out.writeObject(id); out.writeObject(desc); out.writeLong(incarnation); out.flush(); - } + } finally { + if (out != null) out.close(); + } } catch (IOException e) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java --- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-04-18 05:12:10.457507433 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-04-18 05:14:39.887715559 +0100 @@ -233,13 +233,14 @@ proxyLog.log(Log.BRIEF, "trying with factory: " + factory); } - try (Socket testSocket = - factory.createSocket(host, port)) { + Socket testSocket = null; + try { // For HTTP connections, the output (POST request) must // be sent before we verify a successful connection. // So, sacrifice a socket for the sake of testing... // The following sequence should verify a successful // HTTP connection if no IOException is thrown. + testSocket = factory.createSocket(host, port); InputStream in = testSocket.getInputStream(); int b = in.read(); // probably -1 for EOF... } catch (IOException ex) { @@ -249,6 +250,10 @@ continue; } + finally { + if (testSocket != null) + testSocket.close(); + } proxyLog.log(Log.BRIEF, "factory succeeded"); // factory succeeded, open new socket for caller's use diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-04-18 05:14:39.887715559 +0100 @@ -92,9 +92,13 @@ tabName = filename; try { lastModified = new File(tabName).lastModified(); - try (KeyTabInputStream kis = - new KeyTabInputStream(new FileInputStream(filename))) { + KeyTabInputStream kis = null; + try { + kis = new KeyTabInputStream(new FileInputStream(filename)); load(kis); + } finally { + if (kis != null) + kis.close(); } } catch (FileNotFoundException e) { entries.clear(); @@ -441,9 +445,13 @@ public synchronized static KeyTab create(String name) throws IOException, RealmException { - try (KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(name))) { + KeyTabOutputStream kos = null; + try { + kos = new KeyTabOutputStream(new FileOutputStream(name)); kos.writeVersion(KRB5_KT_VNO); + } finally { + if (kos != null) + kos.close(); } return new KeyTab(name); } @@ -452,12 +460,16 @@ * Saves the file at the directory. */ public synchronized void save() throws IOException { - try (KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(tabName))) { + KeyTabOutputStream kos = null; + try { + kos = new KeyTabOutputStream(new FileOutputStream(tabName)); kos.writeVersion(kt_vno); for (int i = 0; i < entries.size(); i++) { kos.writeEntry(entries.elementAt(i)); } + } finally { + if (kos != null) + kos.close(); } } @@ -521,9 +533,13 @@ * @exception IOException. */ public synchronized void createVersion(File file) throws IOException { - try (KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(file))) { + KeyTabOutputStream kos = null; + try { + kos = new KeyTabOutputStream(new FileOutputStream(file)); kos.write16(KRB5_KT_VNO); + } finally { + if (kos != null) + kos.close(); } } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java --- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2014-04-18 05:14:39.887715559 +0100 @@ -179,7 +179,9 @@ // The temporary dir File f = new File(p.getProperty("java.io.tmpdir")); int count = 0; - try (DirectoryStream<Path> stream = Files.newDirectoryStream(f.toPath())) { + DirectoryStream<Path> stream = null; + try { + stream = Files.newDirectoryStream(f.toPath()); // We use a Random object to choose what file names // should be used. Otherwise on a machine with too // many files, the same first 1024 files always get @@ -194,6 +196,10 @@ break; } } + } finally { + if (stream != null) { + stream.close(); + } } } catch (Exception ex) { md.update((byte)ex.hashCode()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java --- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-04-18 05:14:39.887715559 +0100 @@ -1149,9 +1149,14 @@ } else { ByteArrayOutputStream bout = new ByteArrayOutputStream(); keyStore.store(bout, pass); - try (FileOutputStream fout = new FileOutputStream(ksfname)) { + FileOutputStream fout = null; + try { + fout = new FileOutputStream(ksfname); fout.write(bout.toByteArray()); - } + } finally { + if (fout != null) + fout.close(); + } } } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java --- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-04-18 05:12:10.457507433 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-04-18 05:14:39.887715559 +0100 @@ -56,8 +56,9 @@ private static void add(String alias, String pemCert) { // generate certificate from PEM certificate - try (ByteArrayInputStream is = - new ByteArrayInputStream(pemCert.getBytes())) { + ByteArrayInputStream is = null; + try { + is = new ByteArrayInputStream(pemCert.getBytes()); CertificateFactory cf = CertificateFactory.getInstance("X.509"); X509Certificate cert = (X509Certificate)cf.generateCertificate(is); @@ -68,10 +69,15 @@ } catch (CertificateException e) { throw new RuntimeException( "Incorrect untrusted certificate: " + alias, e); - } catch (IOException e) { - throw new RuntimeException( - "Incorrect untrusted certificate: " + alias, e); - } + } finally { + try { + if (is != null) + is.close(); + } catch (IOException e) { + throw new RuntimeException( + "Incorrect untrusted certificate: " + alias, e); + } + } } static { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java --- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2014-04-18 05:14:39.887715559 +0100 @@ -99,14 +99,19 @@ } private void readCommandFile(String path) throws IOException { - try (BufferedReader bf = new BufferedReader(new FileReader(path));) { - StringBuilder sb = new StringBuilder(); - String s; - while ((s = bf.readLine()) != null) { - sb.append(s).append("\n"); - } - command = sb.toString(); - } + BufferedReader bf = null; + try { + bf = new BufferedReader(new FileReader(path)); + StringBuilder sb = new StringBuilder(); + String s; + while ((s = bf.readLine()) != null) { + sb.append(s).append("\n"); + } + command = sb.toString(); + } finally { + if (bf != null) + bf.close(); + } } public static void usage() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java --- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2014-04-18 05:12:10.457507433 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2014-04-18 05:14:39.887715559 +0100 @@ -158,7 +158,9 @@ if (line.trim().equals("stop")) { break; } - try (InputStream in = hvm.executeJCmd(line);) { + InputStream in = null; + try { + in = hvm.executeJCmd(line); // read to EOF and just print output byte b[] = new byte[256]; int n; @@ -169,6 +171,9 @@ System.out.print(s); } } while (n > 0); + } finally { + if (in != null) + in.close(); } } vm.detach(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java --- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2014-04-18 05:14:39.891715618 +0100 @@ -127,9 +127,15 @@ calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { Properties props = new Properties(); - try (FileInputStream fis = new FileInputStream(fname)) { + FileInputStream fis = null; + try { + fis = new FileInputStream(fname); props.load(fis); } + finally { + if (fis != null) + fis.close(); + } return props; } }); diff -Nru openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java --- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2014-04-18 05:14:39.891715618 +0100 @@ -200,7 +200,7 @@ } private static int[][] getUnicodeRanges() { - List<Integer> ranges = new ArrayList<>(); + List<Integer> ranges = new ArrayList<Integer>(); ranges.add(0); Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0); for (int cp = 0x000001; cp < 0x110000; cp++ ) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java --- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-04-18 05:14:39.891715618 +0100 @@ -569,11 +569,11 @@ public Void run() throws BackingStoreException { Map<String, String> m = new TreeMap<>(); long newLastSyncTime = 0; + FileInputStream fis = null; try { newLastSyncTime = prefsFile.lastModified(); - try (FileInputStream fis = new FileInputStream(prefsFile)) { - XmlSupport.importMap(fis, m); - } + fis = new FileInputStream(prefsFile); + XmlSupport.importMap(fis, m); } catch(Exception e) { if (e instanceof InvalidPreferencesFormatException) { getLogger().warning("Invalid preferences format in " @@ -588,6 +588,13 @@ } else { throw new BackingStoreException(e); } + } finally { + try { + if (fis != null) + fis.close(); + } catch (IOException e) { + throw new BackingStoreException(e); + } } // Attempt succeeded; update state prefsCache = m; @@ -614,13 +621,14 @@ AccessController.doPrivileged( new PrivilegedExceptionAction<Void>() { public Void run() throws BackingStoreException { + FileOutputStream fos = null; try { if (!dir.exists() && !dir.mkdirs()) throw new BackingStoreException(dir + " create failed."); - try (FileOutputStream fos = new FileOutputStream(tmpFile)) { - XmlSupport.exportMap(fos, prefsCache); - } + + fos = new FileOutputStream(tmpFile); + XmlSupport.exportMap(fos, prefsCache); if (!tmpFile.renameTo(prefsFile)) throw new BackingStoreException("Can't rename " + tmpFile + " to " + prefsFile); @@ -629,6 +637,14 @@ throw (BackingStoreException)e; throw new BackingStoreException(e); } + finally { + try { + if (fos != null) + fos.close(); + } catch (IOException e) { + throw new BackingStoreException(e); + } + } return null; } }); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java --- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2014-04-18 05:14:39.891715618 +0100 @@ -255,9 +255,16 @@ String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; Path file = Paths.get(fstypes); try { - try (ReadableByteChannel rbc = Files.newByteChannel(file)) { + ReadableByteChannel rbc = null; + try { + rbc = Files.newByteChannel(file); result.load(Channels.newReader(rbc, "UTF-8")); } + finally { + if (rbc != null) { + rbc.close(); + } + } } catch (IOException x) { } return result; diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java --- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2014-04-17 22:51:43.000000000 +0100 +++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2014-04-18 05:14:39.891715618 +0100 @@ -960,25 +960,38 @@ private void handleProcessFailure(final Process failedProcess, final String[] execCmd, final int result) throws IOException { - try (StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw)) { + StringWriter sw = null; + PrintWriter pw = null; + try { + sw = new StringWriter(); + pw = new PrintWriter(sw); pw.append("error=").append(Integer.toString(result)); pw.append(" running:"); for (String arg: execCmd) { pw.append(" '").append(arg).append("'"); } - try (InputStream is = failedProcess.getErrorStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr)) { + InputStream is = null; + InputStreamReader isr = null; + BufferedReader br = null; + try { + is = failedProcess.getErrorStream(); + isr = new InputStreamReader(is); + br = new BufferedReader(isr); while (br.ready()) { pw.println(); pw.append("\t\t").append(br.readLine()); } } finally { pw.flush(); + if (br != null) br.close(); + if (isr != null) isr.close(); + if (is != null) is.close(); throw new IOException(sw.toString()); } - } + } finally { + if (pw != null) pw.close(); + if (sw != null) sw.close(); + } } public Object run() { --- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-01-08 18:26:59.716746329 +0000 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-01-16 02:58:39.413460990 +0000 @@ -159,18 +154,33 @@ throws IOException, KrbException { primaryPrincipal = principal; primaryRealm = principal.getRealm(); - try (FileOutputStream fos = new FileOutputStream(name); - CCacheOutputStream cos = new CCacheOutputStream(fos)) { + FileOutputStream fos = null; + CCacheOutputStream cos = null; + try { + fos = new FileOutputStream(name); + cos = new CCacheOutputStream(fos); version = KRB5_FCC_FVNO_3; cos.writeHeader(primaryPrincipal, version); + } finally { + try { + if (cos != null) + cos.close(); + } finally { + if (fos != null) + fos.close(); + } } + load(name); } synchronized void load(String name) throws IOException, KrbException { PrincipalName p; - try (FileInputStream fis = new FileInputStream(name); - CCacheInputStream cis = new CCacheInputStream(fis)) { + FileInputStream fis = null; + CCacheInputStream cis = null; + try { + fis = new FileInputStream(name); + cis = new CCacheInputStream(fis); version = cis.readVersion(); if (version == KRB5_FCC_FVNO_4) { tag = cis.readTag(); @@ -196,6 +206,14 @@ credentialsList.addElement(cred); } } + } finally { + try { + if (cis != null) + cis.close(); + } finally { + if (fis != null) + fis.close(); + } } } @@ -255,8 +273,11 @@ * Saves the credentials cache file to the disk. */ public synchronized void save() throws IOException, Asn1Exception { - try (FileOutputStream fos = new FileOutputStream(cacheName); - CCacheOutputStream cos = new CCacheOutputStream(fos)) { + FileOutputStream fos = null; + CCacheOutputStream cos = null; + try { + fos = new FileOutputStream(cacheName); + cos = new CCacheOutputStream(fos); cos.writeHeader(primaryPrincipal, version); Credentials[] tmp = null; if ((tmp = getCredsList()) != null) { @@ -264,6 +285,14 @@ cos.addCreds(tmp[i]); } } + } finally { + try { + if (cos != null) + cos.close(); + } finally { + if (fos != null) + fos.close(); + } } }