Attachment 60669 Details for Bug 135531 – patch file

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

[patch] patch file

bugzilla_135531.txt (text/plain), 3.96 KB, created by Cindy Jin

on 2007-03-13 11:00:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2007-03-13 11:00:18 EDT

Size: 3.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.adapter
>Index: src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties,v
>retrieving revision 1.3
>diff -u -r1.3 messages.properties
>--- src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties	18 Sep 2006 06:29:11 -0000	1.3
>+++ src/org/eclipse/hyades/logging/adapter/util/properties/messages.properties	13 Mar 2007 14:55:58 -0000
>@@ -190,6 +190,8 @@
> HyadesGAContextConfigurationErrorNoConfigurationFatal_ERROR_=IWAT0540E Configuration error: The configuration for context {0} does not exist.
> 
> HyadesGA_FilterExit_Invalid_XPATHFilterSpecification_ERROR_=IWAT0541E Invalid XPATH filter specification {0}.
>+
>+INVALID_LOG_TYPE_INFO_                              = IWAT0812I Zero log record is parsed, it maybe a wrong type of log.
>  
> # Message strings:
> EXCEPTION                                           = Exception
>Index: src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java,v
>retrieving revision 1.8
>diff -u -r1.8 BasicContext.java
>--- src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java	29 Sep 2006 19:29:09 -0000	1.8
>+++ src/org/eclipse/hyades/logging/adapter/impl/BasicContext.java	13 Mar 2007 14:55:58 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.hyades.logging.adapter.util.Messages;
> import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
> import org.eclipse.hyades.logging.events.cbe.Situation;
>+import org.eclipse.hyades.logging.adapter.impl.Component;
> /**
>  * BasicContext provide the simplest possible implementation of a Context.
>  * It is a good example for other custom context implementation
>@@ -316,9 +317,12 @@
> 				/* Don't let the listener break us */
> 			}	
> 		}
>+		ISensor sensor= ((ISensor) getComponents()[0]);
>+		
> 		 
> 		Object[] flushedSensorContent=((ISensor) getComponents()[0]).flush();
> 		
>+		
> 		if(listener!=null && !isHardStop()) {
> 			try {
> 				listener.postProcessEventItems(getComponents()[0], flushedSensorContent);
>@@ -329,7 +333,25 @@
> 		}
> 		
> 		flushMessages(flushedSensorContent, 1);
>+		//bugziila 135531, If the itemes processed by sensor is bigger than 0, 
>+		//but output is 0. Then the log file could be wrong type.
>+		IComponent compentets[] = getComponents();
>+		if (((Component) (getComponents()[compentets.length - 1])) != null) {
>+			
>+			if (((Component) (getComponents()[0])).getItemsProcessedCount() > 0
>+					&& ((Component) (compentets[compentets.length - 1]))
>+							.getItemsProcessedCount() == 0) {
>+				
>+				CommonBaseEvent event = getEventFactory()
>+						.createCommonBaseEvent();
>+				event.setMsg(Messages.getString("INVALID_LOG_TYPE_INFO_"));
>+				event.setSeverity(CommonBaseEvent.SEVERITY_FATAL);
>+				log(event);
>+
>+			}
>+		}
> 		super.stop();
>+		
> 	}
> 	/**
> 	 * flushMessages flushes any messages cached by a component to the next component.
>Index: src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java,v
>retrieving revision 1.6
>diff -u -r1.6 SimpleExtractor.java
>--- src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	17 Feb 2006 18:22:14 -0000	1.6
>+++ src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	13 Mar 2007 14:55:58 -0000
>@@ -201,6 +201,7 @@
> 				
> 			}
> 			//no filter against the records
>+			incrementItemsProcessedCount(tmpMessages.length);
> 			return tmpMessages;
> 			
> 		}

Actions: View | Diff

Attachments on bug 135531: 60669 | 65274 | 65276