Attachment 80801 Details for Bug 197177 – Eclipse patch file for the fix.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Eclipse patch file for the fix.

197177 patch.txt (text/plain), 1.37 KB, created by Bing Xu

on 2007-10-19 16:31:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bing Xu

Created: 2007-10-19 16:31:32 EDT

Size: 1.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.execution
>Index: src-local/org/eclipse/hyades/execution/security/KeystoreHelper.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-local/org/eclipse/hyades/execution/security/KeystoreHelper.java,v
>retrieving revision 1.3
>diff -u -r1.3 KeystoreHelper.java
>--- src-local/org/eclipse/hyades/execution/security/KeystoreHelper.java	13 Sep 2005 16:46:19 -0000	1.3
>+++ src-local/org/eclipse/hyades/execution/security/KeystoreHelper.java	19 Oct 2007 20:26:29 -0000
>@@ -44,7 +44,8 @@
> 		File file=new File(pathname);
> 		
> 		/* Do not stomp an existing file */
>-		if(!file.exists()) {
>+		/* bug 197177, handle situation when dat file is of size 0. */
>+		if(!file.exists() || file.length() == 0) {
> 			ks.load(null, password.toCharArray());
> 			persistKeyStore(ks, pathname, password);
> 		}
>@@ -64,8 +65,9 @@
> 		KeyStore ks=null;
> 		File file=new File(pathname);
> 		
>-		/* Do not stomp an existing file */
>-		if(file.exists()) {
>+		/* Do not stomp an existing file. */
>+		/* bug 197177.  Add check for file size in case this method is called by others */
>+		if(file.exists()&& file.length() > 0) {
> 			ks=KeyStore.getInstance("JKS");
> 			/* Initialize the keystore with no information */
> 			FileInputStream is=new FileInputStream(file);

Actions: View | Diff

Attachments on bug 197177: 74170 | 80801