[jboss-svn-commits] JBL Code SVN: r23960 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/base/mvel and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2008-11-19 07:22:56 -0500 (Wed, 19 Nov 2008)
New Revision: 23960

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
Log:
-fixed MVEL parser context naming issue.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-11-19 12:07:01 UTC (rev 23959)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-11-19 12:22:56 UTC (rev 23960)
@@ -136,7 +136,7 @@
     private int                                            languageLevel;
     public static final Object                             COMPILER_LOCK                  = new Object();
     
-    private static AtomicInteger                           nameCounter;
+    private static AtomicInteger                           nameCounter = new AtomicInteger();
 
     public MVELDialect(PackageBuilder builder,
                        PackageRegistry pkgRegistry,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java	2008-11-19 12:07:01 UTC (rev 23959)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java	2008-11-19 12:22:56 UTC (rev 23960)
@@ -28,7 +28,7 @@
     implements
     Externalizable {
     private String                          name;
-    private static AtomicInteger            nameCounter;
+    private static AtomicInteger            nameCounter = new AtomicInteger();
     
     private String                          expression;
 
@@ -88,6 +88,9 @@
 
     public static final Object              COMPILER_LOCK = new Object();
 
+    public MVELCompilationUnit() {
+    }
+
     public MVELCompilationUnit(String name, 
                                String expression,
                                String[] pkgImports,
@@ -102,6 +105,7 @@
                                String[] inputTypes,
                                int languageLevel,
                                boolean strictMode) {
+        this.name = name;
         this.expression = expression;
 
         this.pkgImports = pkgImports;
@@ -126,7 +130,8 @@
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
-
+        out.writeUTF( name );
+        
         out.writeUTF( expression );
 
         out.writeObject( pkgImports );
@@ -150,6 +155,7 @@
 
     public void readExternal(ObjectInput in) throws IOException,
                                             ClassNotFoundException {
+        name = in.readUTF();
         expression = in.readUTF();
 
         pkgImports = (String[]) in.readObject();