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

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

Author: tirelli
Date: 2010-03-05 10:12:16 -0500 (Fri, 05 Mar 2010)
New Revision: 31961

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java
Log:
JBRULES-2433: Fixing ClassObjectType instantiation. Removing duplicate code from PatternBuilder.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2010-03-05 13:30:14 UTC (rev 31960)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2010-03-05 15:12:16 UTC (rev 31961)
@@ -167,11 +167,6 @@
                                    objectType,
                                    patternDescr.getIdentifier(),
                                    patternDescr.isInternalFact() );
-            if ( objectType instanceof ClassObjectType ) {
-                // make sure PatternExtractor is wired up to correct ClassObjectType and set as a target for rewiring
-                context.getPkg().getClassFieldAccessorStore().getClassObjectType( ((ClassObjectType) objectType),
-                                                                                  (PatternExtractor) pattern.getDeclaration().getExtractor() );
-            }
         } else {
             pattern = new Pattern( context.getNextPatternId(),
                                    0, // offset is 0 by default

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java	2010-03-05 13:30:14 UTC (rev 31960)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java	2010-03-05 15:12:16 UTC (rev 31961)
@@ -232,7 +232,7 @@
     public ClassObjectType getClassObjectType(final ClassObjectType objectType,
                                               final AcceptsClassObjectType target) {
         return getClassObjectType( objectType,
-                                   false,
+                                   objectType.isEvent(),
                                    target );
     }