Author: doogie
Date: Sat Jul 31 18:41:17 2010
New Revision: 981079
URL: http://svn.apache.org/viewvc?rev=981079&view=rev
Log:
Applied fix from trunk for revision: 980641
===
Fix checkRhs logic when comparing the value type to the field type.
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 31 18:41:17 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980935,981051
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641,980935,981051
Modified:
ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=981079&r1=981078&r2=981079&view=diff
==============================================================================
---
ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
(original)
+++
ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
Sat Jul 31 18:41:17 2010
@@ -243,10 +243,16 @@ public class EntityExpr extends EntityCo
Debug.logWarning(e, module);
}
// make sure the type of keyFieldName of EntityConditionSubSelect
matches the field Java type
- if (!ObjectType.instanceOf(valueType.getJavaType(),
type.getJavaType())) {
- String errMsg = "Warning using ["+ value.getClass().getName()
+ "] and entity field [" + modelEntity.getEntityName() + "." +
curField.getName() + "]. The Java type of keyFieldName : [" +
valueType.getJavaType()+ "] is not compatible with the Java type of the field
[" + type.getJavaType() + "]";
+ try {
+ if
(!ObjectType.instanceOf(ObjectType.loadClass(valueType.getJavaType()),
type.getJavaType())) {
+ String errMsg = "Warning using ["+
value.getClass().getName() + "] and entity field [" +
modelEntity.getEntityName() + "." + curField.getName() + "]. The Java type of
keyFieldName : [" + valueType.getJavaType()+ "] is not compatible with the Java
type of the field [" + type.getJavaType() + "]";
+ // eventually we should do this, but for now we'll do a
"soft" failure: throw new IllegalArgumentException(errMsg);
+ Debug.logWarning(new Exception("Location of database type
warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr
=-=-=-=-=-=-=-=-= " + errMsg, module);
+ }
+ } catch (ClassNotFoundException e) {
+ String errMsg = "Warning using ["+ value.getClass().getName()
+ "] and entity field [" + modelEntity.getEntityName() + "." +
curField.getName() + "]. The Java type of keyFieldName : [" +
valueType.getJavaType()+ "] could not be found]";
// eventually we should do this, but for now we'll do a "soft"
failure: throw new IllegalArgumentException(errMsg);
- Debug.logWarning(new Exception("Location of database type
warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr
=-=-=-=-=-=-=-=-= " + errMsg, module);
+ Debug.logWarning(e, "=-=-=-=-=-=-=-=-= Database type warning
in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
}
} else {
// make sure the type matches the field Java type
