6868867: Test: sun/security/tools/keytool/standard.sh fails under windows/cygwin

Reviewed-by: wetmore

src/share/classes/sun/security/tools/KeyTool.java

@@ -880,14 +880,19 @@ public final class KeyTool {
             // might not work properly, since -gencert is slow
             // and there's no data in the pipe at the beginning.
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
+            try {
                 byte[] b = new byte[4096];
                 while (true) {
                     int len = inStream.read(b);
                     if (len < 0) break;
                     bout.write(b, 0, len);
                 }
+            } finally {
+                if (inStream != System.in) {
+                    inStream.close();
+                }
+            }
             inStream = new ByteArrayInputStream(bout.toByteArray());
-            try {
             String importAlias = (alias!=null)?alias:keyAlias;
             if (keyStore.entryInstanceOf(importAlias, KeyStore.PrivateKeyEntry.class)) {
                 kssave = installReply(importAlias, inStream);
@@ -910,11 +915,6 @@ public final class KeyTool {
                         ("Certificate was not added to keystore"));
                 }
             }
-            } finally {
-                if (inStream != System.in) {
-                    inStream.close();
-                }
-            }
         } else if (command == IMPORTKEYSTORE) {
             doImportKeyStore();
             kssave = true;