svn commit: r954960 - in /ofbiz/branches/release10.04: ./ framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java

[doogie-3]

Author: doogie
Date: Tue Jun 15 16:44:35 2010
New Revision: 954960

URL: http://svn.apache.org/viewvc?rev=954960&view=rev
Log:
Applied fix from trunk for revision: 954956
 Fix pure toString handling of values that contains "'" in them; this was

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
    ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 16:44:35 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
+/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

Modified: ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=954960&r1=954959&r2=954960&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original)
+++ ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Tue Jun 15 16:44:35 2010
@@ -181,8 +181,6 @@ public abstract class EntityFunction<T e
         this.function = function;
         if (value instanceof EntityConditionValue) {
             this.nested = (EntityConditionValue) value;
-        } else if (value instanceof String) {
-            this.value = ((String) value).replaceAll("'", "''");
         } else {
             this.value = value;
         }

Modified: ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java?rev=954960&r1=954959&r2=954960&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java (original)
+++ ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java Tue Jun 15 16:44:35 2010
@@ -937,7 +937,13 @@ public class SqlJdbcUtil {
         if (field != null) {
             buffer.append('?');
         } else {
-            buffer.append('\'').append(value).append('\'');
+            buffer.append('\'');
+            if (value instanceof String) {
+                buffer.append(((String) value).replaceAll("'", "''"));
+            } else {
+                buffer.append(value);
+            }
+            buffer.append('\'');
         }
         if (field != null && params != null) params.add(new EntityConditionParam(field, value));
     }