Author: gnodet Date: Wed Mar 18 17:05:09 2009 New Revision: 755651 URL: http://svn.apache.org/viewvc?rev=755651&view=rev Log: SSHD-18: Close private key stream after reading it
Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java Modified: mina/sshd/trunk/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java URL: http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java?rev=755651&r1=755650&r2=755651&view=diff ============================================================================== --- mina/sshd/trunk/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java (original) +++ mina/sshd/trunk/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java Wed Mar 18 17:05:09 2009 @@ -82,9 +82,13 @@ for (int i = 0; i < files.length; i++) { try { PEMReader r = new PEMReader(new InputStreamReader(new FileInputStream(files[i])), passwordFinder); - Object o = r.readObject(); - if (o instanceof KeyPair) { - keys.add((KeyPair) o); + try { + Object o = r.readObject(); + if (o instanceof KeyPair) { + keys.add((KeyPair) o); + } + } finally { + r.close(); } } catch (Exception e) { LOG.info("Unable to read key {}: {}", files[i], e);