Author: tsurdilovic
Date: 2011-01-16 21:45:51 -0500 (Sun, 16 Jan 2011)
New Revision: 36538
Modified:
labs/jbossrules/soa_branches/BRMS-5.0.2-GA_BRMS-532_BRMS-533/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java
Log:
BRMS-535 Fix for BRMS-532 and BRMS-533
Modified: labs/jbossrules/soa_branches/BRMS-5.0.2-GA_BRMS-532_BRMS-533/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.2-GA_BRMS-532_BRMS-533/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java 2011-01-17 02:45:13 UTC (rev 36537)
+++ labs/jbossrules/soa_branches/BRMS-5.0.2-GA_BRMS-532_BRMS-533/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java 2011-01-17 02:45:51 UTC (rev 36538)
@@ -1,19 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package org.drools.common;
import java.io.Serializable;
@@ -21,6 +5,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+
import org.drools.facttemplates.Fact;
import org.drools.reteoo.ClassObjectTypeConf;
import org.drools.reteoo.FactTemplateTypeConf;
@@ -28,13 +13,9 @@
import org.drools.rule.EntryPoint;
public class ObjectTypeConfigurationRegistry implements Serializable {
- private static final long serialVersionUID = 510l;
-
private InternalRuleBase ruleBase;
private ConcurrentMap<Object, ObjectTypeConf> typeConfMap;
-
-
public ObjectTypeConfigurationRegistry(InternalRuleBase ruleBase ) {
super();
this.ruleBase = ruleBase;
@@ -56,7 +37,7 @@
// first see if it's a ClassObjectTypeConf
ObjectTypeConf objectTypeConf = null;
Object key = ( object instanceof Fact ) ? ((Fact) object).getFactTemplate().getName() : object.getClass();
- objectTypeConf = this.typeConfMap.get( key );
+ objectTypeConf = this.typeConfMap.get( key );
// it doesn't exist, so create it.
if ( objectTypeConf == null ) {
@@ -70,6 +51,7 @@
this.ruleBase );
}
}
+
ObjectTypeConf existing = this.typeConfMap.putIfAbsent( key, objectTypeConf );
if ( existing != null ) {
// Raced, take the (now) existing.