Attachment 94646 Details for Bug 189128 – Patch V2

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

[patch] Patch V2

Defect_189128_patch_v2.txt (text/plain), 5.25 KB, created by Paul Slauenwhite

on 2008-04-02 20:45:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-04-02 20:45:37 EDT

Size: 5.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.test.recorders.url
>Index: src-ui/org/eclipse/tptp/test/recorders/url/ui/internal/util/URLRecorderRegistryInfo.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.recorders.url/src-ui/org/eclipse/tptp/test/recorders/url/ui/internal/util/URLRecorderRegistryInfo.java,v
>retrieving revision 1.2
>diff -u -r1.2 URLRecorderRegistryInfo.java
>--- src-ui/org/eclipse/tptp/test/recorders/url/ui/internal/util/URLRecorderRegistryInfo.java	13 Mar 2008 18:45:02 -0000	1.2
>+++ src-ui/org/eclipse/tptp/test/recorders/url/ui/internal/util/URLRecorderRegistryInfo.java	3 Apr 2008 00:42:57 -0000
>@@ -33,7 +33,7 @@
>  * 
>  * @author  Paul E. Slauenwhite
>  * @author  Mark D. Dunn
>- * @version March 13, 2008
>+ * @version April 2, 2008
>  * @since   March 11, 2008
>  */
> public class URLRecorderRegistryInfo {
>@@ -197,12 +197,35 @@
> 		try
> 		{
> 			try {
>-			Process registryChange = Runtime.getRuntime().exec(getOriginalInfoCommandLine,null);
>-			registryChange.waitFor();
>+			
>+				Process registryChange = Runtime.getRuntime().exec(getOriginalInfoCommandLine,null);
>+				registryChange.waitFor();
>+			}
>+			catch (InterruptedException e) {
>+				//Ignore and continue.
> 			}
>-			catch (InterruptedException e) {}
>+			
> 			// bugzilla 126592 mdd use originalSettingsFilePath rather than ...FileName
> 			file = new File(originalSettingsFilePath);
>+			
>+			//Since the regedit process may terminate before the exported registry file is created,
>+			//check if the file is created every 200 ms to a maximum of 1 second:
>+			for (int counter = 0; counter < 5; counter++) {
>+
>+				if(file.exists()){
>+					break;
>+				}
>+				else{
>+					
>+					try {
>+						Thread.sleep(200);
>+					} 
>+					catch (InterruptedException e) {
>+						//Ignore and continue.
>+					}
>+				}
>+			}
>+			
> 			inputReader= new InputStreamReader(new FileInputStream(file),"UTF-16");//$NON-NLS-1$
> 			inputFileContents = new StringBuffer();
> 			char[] inputBuf = new char[1000];
>@@ -239,7 +262,7 @@
> 				}
> 				catch (IOException e1)
> 				{
>-					URLRecorderActivator.logError(e1);
>+					//Ignore since closing input stream reader.
> 				}
> 		}
> 		// Clean up
>#P org.eclipse.hyades.test.core
>Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/InternetExplorerAdapter.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/InternetExplorerAdapter.java,v
>retrieving revision 1.16
>diff -u -r1.16 InternetExplorerAdapter.java
>--- src/org/eclipse/hyades/execution/recorder/local/appadapters/InternetExplorerAdapter.java	18 Mar 2008 20:31:48 -0000	1.16
>+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/InternetExplorerAdapter.java	3 Apr 2008 00:42:58 -0000
>@@ -36,7 +36,7 @@
>  * @author  Ernest Jessee
>  * @author  Paul E. Slauenwhite
>  * @author  Duwayne Morris
>- * @version February 28, 2008
>+ * @version April 2, 2008
>  * @since   April 22, 2005
>  * @deprecated  This is not public API.  It will be moved to internal in TPTP 5.0.
>  */
>@@ -450,14 +450,54 @@
> 			for (int i = 0; i < regInfo.length; i++)
> 			{
> 				if (i == 2  && bRunningVista == false){  // the Java command console registry setting is not available on Vista
>+					
> 					registryChange = Runtime.getRuntime().exec(consolecmdLine + regInfo[i],null);	
> 					
>+					registryChange.waitFor();
>+					
>+					//Since the regedit process may terminate before the exported registry file is created,
>+					//check if the file is created every 200 ms to a maximum of 1 second:
>+					for (int counter = 0; counter < 5; counter++) {
>+
>+						if(consoleFile.exists()){
>+							break;
>+						}
>+						else{
>+							
>+							try {
>+								Thread.sleep(200);
>+							} 
>+							catch (InterruptedException e) {
>+								//Ignore and continue.
>+							}
>+						}
>+					}
> 				} 
> 				else {
>+				
> 					registryChange = Runtime.getRuntime().exec(cmdLine + regInfo[i],null);
>-				}
>+
>+					registryChange.waitFor();
> 					
>-				registryChange.waitFor();
>+					//Since the regedit process may terminate before the exported registry file is created,
>+					//check if the file is created every 200 ms to a maximum of 1 second:
>+					for (int counter = 0; counter < 5; counter++) {
>+
>+						if(file.exists()){
>+							break;
>+						}
>+						else{
>+							
>+							try {
>+								Thread.sleep(200);
>+							} 
>+							catch (InterruptedException e) {
>+								//Ignore and continue.
>+							}
>+						}
>+					}
>+				}
>+							
> 				if (i == 2  && bRunningVista == false){
> 					// the Java command console registry setting is not available on Vista
> 					// so this was throwing a File I/O exception
>@@ -480,11 +520,11 @@
> 		}
> 		catch (IOException e)
> 		{
>-			e.printStackTrace();
>+			TestCorePlugin.getDefault().logError(e);
> 		} 
> 		catch (InterruptedException e)
> 		{
>-			e.printStackTrace();
>+			TestCorePlugin.getDefault().logError(e);
> 		}
> 		finally
> 		{
>@@ -495,7 +535,7 @@
> 				}
> 				catch (IOException e1)
> 				{
>-					e1.printStackTrace();
>+					//Ignore since closing input stream reader.
> 				}
> 		}
> 		return inputFileContents;

Actions: View | Diff

Attachments on bug 189128: 68760 | 69125 | 69126 | 94607 | 94646