Fix for issue nHapiNET#51 on nHapi duaneedwards github repo.

ExactDataLLC · May 11, 2016 · a25e4f3 · a25e4f3
1 parent 0014942
commit a25e4f3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/NHapi20/NHapi.Base/Parser/PipeParser.cs b/NHapi20/NHapi.Base/Parser/PipeParser.cs
@@ -220,8 +220,9 @@ protected internal override IMessage DoParse(String message, String version)
 
             FilterIterator segmentIter = new FilterIterator(messageIter, new SegmentOnlyPredicate());
 
-            string lastSegmentName = null;
+            string lastSegmentName = "MSH";
 			String[] segments = Split(message, segDelim);
+            IStructure lastStructureParsed = theMessage;
 			EncodingCharacters encodingChars = GetEncodingChars(message);
 			for (int i = 0; i < segments.Length; i++)
             {
@@ -236,9 +237,7 @@ protected internal override IMessage DoParse(String message, String version)
 					log.Debug("Parsing segment " + name);
                     if (!name.Equals(lastSegmentName, StringComparison.CurrentCultureIgnoreCase))
                     {
-                        // If the message iterator passes a segment that is later encountered the message object won't be properly parsed.
-                        // Rebuild the iterator for each segment, or fix iterator logic in handling unexpected segments.
-                        messageIter = new MessageIterator(theMessage, "MSH", true);
+                        messageIter = new MessageIterator(lastStructureParsed, name, true);
                         segmentIter = new FilterIterator(messageIter, new SegmentOnlyPredicate());
                         lastSegmentName = name;
                     }
@@ -248,7 +247,9 @@ protected internal override IMessage DoParse(String message, String version)
 					FilterIterator dirIter = new FilterIterator(segmentIter, new StructureNamePredicate(name));
 					if (dirIter.MoveNext())
 					{
-						Parse((ISegment) dirIter.Current, segments[i], encodingChars);                        
+					    ISegment targetSegment = (ISegment) dirIter.Current;
+					    Parse(targetSegment, segments[i], encodingChars);
+                        lastStructureParsed = targetSegment;
 					}
 				}
 			}