From: bananeweizen <bananeweizen>
Date: Sun, 15 Jan 2006 18:24:54 +0000 (+0000)
Subject: unification of bug fixes 1198893, 1404228
X-Git-Url: http://git.phpeclipse.com?hp=78a5ffe01b3b17c09701d73474e1467b3b5a3eec

unification of bug fixes 1198893, 1404228
---

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
index 559dc88..d9e8c7f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
@@ -203,7 +203,9 @@ public class FastJavaPartitionScanner implements IPartitionTokenScanner, IPHPPar
 					}
 					else {
 						// bug #1404228: Crash on <?php // comment ?>
-						fScanner.unread();
+						if (nextch!=ICharacterScanner.EOF) {
+							fScanner.unread();
+						}
 					}
 				}