Attachment 53249 Details for Bug 163424 – fix patch for org.eclipse.hyades.logging.adapter

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

[patch] fix patch for org.eclipse.hyades.logging.adapter

bugzilla163424.patch.txt (text/plain), 3.11 KB, created by Dave Smith

on 2006-11-04 00:11:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Smith

Created: 2006-11-04 00:11:20 EST

Size: 3.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.adapter
>Index: src/org/eclipse/hyades/logging/adapter/impl/Component.java
>===================================================================
>RCS file: /home/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/impl/Component.java,v
>retrieving revision 1.11
>diff -u -r1.11 Component.java
>--- src/org/eclipse/hyades/logging/adapter/impl/Component.java	20 Sep 2006 02:59:51 -0000	1.11
>+++ src/org/eclipse/hyades/logging/adapter/impl/Component.java	4 Nov 2006 05:11:24 -0000
>@@ -241,7 +241,7 @@
> 					 * If it is disabled invalid configuration exceptions will
> 					 * be ignored.  If it is not disbled then rethrow the exception. 
> 					 */
>-					if (!((Component)components[i]).isDisabled()) {
>+					if (!this.isDisabled() && !((Component)components[i]).isDisabled()) {
> 						throw ie;
> 					}
> 				}
>Index: src/org/eclipse/hyades/logging/adapter/internal/util/Controller.java
>===================================================================
>RCS file: /home/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/internal/util/Controller.java,v
>retrieving revision 1.6
>diff -u -r1.6 Controller.java
>--- src/org/eclipse/hyades/logging/adapter/internal/util/Controller.java	8 Sep 2006 07:25:13 -0000	1.6
>+++ src/org/eclipse/hyades/logging/adapter/internal/util/Controller.java	4 Nov 2006 05:11:25 -0000
>@@ -150,6 +150,16 @@
> 	            // Stop the logging context.
> 	            if (contexts[0] != null && contextThreads.length > 0 && contextThreads[0] != null  && contextThreads[0].isAlive()) {
> 	                contexts[0].setStopping(true);
>+	                // Wait until logging context is finished
>+	                while (contextThreads[0] != null  && contextThreads[0].isAlive()) {
>+	                	try {
>+		            		Thread.sleep(200);
>+		            		System.out.println("Waited half second for logging context to end");
>+		            	}
>+		            	catch (InterruptedException e) {
>+		            	
>+		            	}
>+	                }
> 	            }
> 	    	}
>     	}
>@@ -402,7 +412,10 @@
> 	                     */
> 	                    try {
> 	                    	contexts[i].update();
>-	                    	contextsReadyCount++;
>+	                    	// Only increment context ready count if context is not disabled
>+	                    	if (!contexts[i].isDisabled()) {
>+	                    		contextsReadyCount++;
>+	                    	}
> 	                    }
> 	                    catch(AdapterException e) {
> 	                    	if (!validating) {
>@@ -515,7 +528,10 @@
> 	                     */
> 	                    try {
> 	                    	contexts[i].update();
>-	                    	contextsReadyCount++;
>+	                    	// Only increment context ready count if context is not disabled
>+	                    	if (!contexts[i].isDisabled()) {
>+	                    		contextsReadyCount++;
>+	                    	}
> 	                    }
> 	                    catch(AdapterException e) {
> 	                    	if (!validating) {

Actions: View | Diff

Attachments on bug 163424: 53249