[jboss-svn-commits] JBL Code SVN: r22824 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/lang and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: porcelli
Date: 2008-09-16 16:31:22 -0400 (Tue, 16 Sep 2008)
New Revision: 22824

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLIncompleteCodeTest.java
Log:
JBRULES-1689: small fixes preventing NullPointer on DrlParser in editor mode.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java	2008-09-16 19:10:26 UTC (rev 22823)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java	2008-09-16 20:31:22 UTC (rev 22824)
@@ -207,6 +207,9 @@
 			}
 		} catch (Exception e) {
 			if (isEditor) {
+				if (walker == null){
+					return null;
+				}
 				return walker.getPackageDescr();
 			} else {
 				throw new DroolsParserException(

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLIncompleteCodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLIncompleteCodeTest.java	2008-09-16 19:10:26 UTC (rev 22823)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLIncompleteCodeTest.java	2008-09-16 20:31:22 UTC (rev 22824)
@@ -187,6 +187,22 @@
 				.getTarget());
 	}
 	
+
+	public void testIncompleteCode13() throws DroolsParserException, RecognitionException {
+		String input = 
+			"package com.sample " +
+			"import com.sample.DroolsTest.Message; " +
+			"rule \"Hello World\"" +
+			"  when " +
+			"  then" +
+			"     \\\" " +
+			"end ";
+		DrlParser parser = new DrlParser();
+		PackageDescr descr = parser.parse(true, input);
+		assertNull(descr);
+	}
+	
+	
 	@SuppressWarnings("unchecked")
 	private int getLastIntegerValue(LinkedList list) {
 //		System.out.println(list.toString());