Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 163424
Collapse All | Expand All

(-)src/org/eclipse/hyades/logging/adapter/impl/Component.java (-1 / +1 lines)
Lines 241-247 Link Here
241 
					 * If it is disabled invalid configuration exceptions will
 241 
					 * If it is disabled invalid configuration exceptions will
242 
					 * be ignored.  If it is not disbled then rethrow the exception.
242 
					 * be ignored.  If it is not disbled then rethrow the exception.
243 
					 */
 243 
					 */
244 
					if (!((Component)components[i]).isDisabled()) {
 244 
					if (!this.isDisabled() && !((Component)components[i]).isDisabled()) {
245 
						throw ie;
 245 
						throw ie;
246 
					}
 246 
					}
247 
				}
 247 
				}
(-)src/org/eclipse/hyades/logging/adapter/internal/util/Controller.java (-2 / +18 lines)
Lines 150-155 Link Here
150 
	            // Stop the logging context.
 150 
	            // Stop the logging context.
151 
	            if (contexts[0] != null && contextThreads.length > 0 && contextThreads[0] != null  && contextThreads[0].isAlive()) {
 151 
	            if (contexts[0] != null && contextThreads.length > 0 && contextThreads[0] != null  && contextThreads[0].isAlive()) {
152 
	                contexts[0].setStopping(true);
 152 
	                contexts[0].setStopping(true);
153 
	                // Wait until logging context is finished
154 
	                while (contextThreads[0] != null  && contextThreads[0].isAlive()) {
155 
	                	try {
156 
		            		Thread.sleep(200);
157 
		            		System.out.println("Waited half second for logging context to end");
158 
		            	}
159 
		            	catch (InterruptedException e) {
160
161 
		            	}
162 
	                }
153 
	            }
 163 
	            }
154 
	    	}
 164 
	    	}
155 
    	}
 165 
    	}
Lines 402-408 Link Here
402 
	                     */
 412 
	                     */
403 
	                    try {
 413 
	                    try {
404 
	                    	contexts[i].update();
 414 
	                    	contexts[i].update();
405 
	                    	contextsReadyCount++;
 415 
	                    	// Only increment context ready count if context is not disabled
416 
	                    	if (!contexts[i].isDisabled()) {
417 
	                    		contextsReadyCount++;
418 
	                    	}
406 
	                    }
 419 
	                    }
407 
	                    catch(AdapterException e) {
 420 
	                    catch(AdapterException e) {
408 
	                    	if (!validating) {
 421 
	                    	if (!validating) {
Lines 515-521 Link Here
515 
	                     */
 528 
	                     */
516 
	                    try {
 529 
	                    try {
517 
	                    	contexts[i].update();
 530 
	                    	contexts[i].update();
518 
	                    	contextsReadyCount++;
 531 
	                    	// Only increment context ready count if context is not disabled
532 
	                    	if (!contexts[i].isDisabled()) {
533 
	                    		contextsReadyCount++;
534 
	                    	}
519 
	                    }
 535 
	                    }
520 
	                    catch(AdapterException e) {
 536 
	                    catch(AdapterException e) {
521 
	                    	if (!validating) {
 537 
	                    	if (!validating) {

Return to bug 163424