Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-11-01 12:02:50 +0000
committerUwe Stieber2012-11-01 12:02:50 +0000
commitb750015ca4072af7cf459e968c6297b689ee11b3 (patch)
tree99bddbeb5ea52122448c800a484db3de62ccf30d /plugins
parent97f18c69959c1ac152ad6800a695a513b4e0741e (diff)
downloadorg.eclipse.tcf-b750015ca4072af7cf459e968c6297b689ee11b3.tar.gz
org.eclipse.tcf-b750015ca4072af7cf459e968c6297b689ee11b3.tar.xz
org.eclipse.tcf-b750015ca4072af7cf459e968c6297b689ee11b3.zip
Releng (Feature Structure): Fix Bug 393266 - Isolate debug functionality from the rest
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
index 6ba2d54ae..c18bc4178 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
@@ -158,7 +158,6 @@ public class TCFSecurityManager {
else if (s.indexOf("-----END ") == 0) break; //$NON-NLS-1$
else if (app) bf.append(s);
}
- r.close();
KeyFactory kf = KeyFactory.getInstance("RSA"); //$NON-NLS-1$
byte[] bytes = Base64.toByteArray(bf.toString().toCharArray());
return kf.generatePrivate(new PKCS8EncodedKeySpec(bytes));
@@ -172,6 +171,8 @@ public class TCFSecurityManager {
Protocol.log("Cannot close private key file: " + f, x); //$NON-NLS-1$
}
return null;
+ } finally {
+ if (r != null) try { r.close(); } catch (IOException e) {}
}
}

Back to the top