Fix Syslog parser

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@27035 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

gazelle-proxy-common-war/src/main/webapp/messageList.xhtml

@@ -7,7 +7,7 @@
 	xmlns:a4j="http://richfaces.org/a4j">
 
 	<rich:dataTable id="messagesList"
-		value="#{messages}" var="message" rows="20">
+		value="#{messagesList}" var="message" rows="20">
 
 		<f:facet name="header">
 			<rich:datascroller id="datascrollerHead" />

gazelle-proxy-common-war/src/main/webapp/messages.xhtml

@@ -115,7 +115,7 @@
 
 			<s:div id="panelOfMessages">
 				<ui:include src="messageList.xhtml">
-					<ui:param name="messages" value="#{messagesBean.messageDataModel}" />
+					<ui:param name="messagesList" value="#{messagesBean.messageDataModel}" />
 				</ui:include>
 			</s:div>
 

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/protocols/syslog/SyslogFrameDecoder.java

@@ -29,6 +29,7 @@ class SyslogFrameDecoder extends FrameDecoder {
 			if (status == STATUS_INIT) {
 				messageSizeBuffer = new StringBuffer();
 				currentFrame = new ByteArrayOutputStream();
+				status = STATUS_SIZE;
 			}
 
 			switch (status) {
@@ -42,6 +43,7 @@ class SyslogFrameDecoder extends FrameDecoder {
 				}
 				break;
 			case STATUS_READ:
+				currentFrame.write(readByte);
 				if (currentFrame.size() == messageSize) {
 					status = STATUS_INIT;
 					byte[] bytes = currentFrame.toByteArray();
@@ -50,7 +52,6 @@ class SyslogFrameDecoder extends FrameDecoder {
 							new ByteArrayInputStream(bytes));
 					return new SyslogData(syslogMessage, rawMessage);
 				}
-				currentFrame.write(readByte);
 				break;
 			default:
 				break;

gazelle-proxy-war/src/main/webapp/searchMessageStep.xhtml

@@ -54,7 +54,7 @@
 
 			<s:div id="panelOfMessages">
 				<ui:include src="messageList.xhtml">
-					<ui:param name="messages"
+					<ui:param name="messagesList"
 						value="#{messagesStepBean.messageDataModel}" />
 				</ui:include>
 			</s:div>

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>net.ihe.gazelle.maven</groupId>
 		<artifactId>gazelle-seam</artifactId>
-		<version>1.47</version>
+		<version>1.48</version>
 	</parent>
 
 	<groupId>net.ihe.gazelle.proxy</groupId>