Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 23084 invoked from network); 10 Oct 2005 00:26:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Oct 2005 00:26:41 -0000 Received: (qmail 57375 invoked by uid 500); 10 Oct 2005 00:26:40 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 57334 invoked by uid 500); 10 Oct 2005 00:26:40 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 57323 invoked by uid 500); 10 Oct 2005 00:26:40 -0000 Received: (qmail 57320 invoked by uid 99); 10 Oct 2005 00:26:40 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 09 Oct 2005 17:26:40 -0700 Received: (qmail 22947 invoked by uid 1510); 10 Oct 2005 00:26:20 -0000 Date: 10 Oct 2005 00:26:20 -0000 Message-ID: <20051010002620.22946.qmail@minotaur.apache.org> From: arminw@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/cache CachingStrategyTwoLevelImpl.java X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N arminw 2005/10/09 17:26:19 Modified: src/java/org/apache/ojb/broker/cache CachingStrategyTwoLevelImpl.java Log: fix, put all values into object cache map Revision Changes Path 1.6 +5 -5 db-ojb/src/java/org/apache/ojb/broker/cache/CachingStrategyTwoLevelImpl.java Index: CachingStrategyTwoLevelImpl.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/CachingStrategyTwoLevelImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CachingStrategyTwoLevelImpl.java 7 Oct 2005 14:54:48 -0000 1.5 +++ CachingStrategyTwoLevelImpl.java 10 Oct 2005 00:26:19 -0000 1.6 @@ -138,8 +138,7 @@ value = fld.getFieldConversion().javaToSql(value); // copy the sql type value = fld.getJdbcType().getFieldType().copy(value); - // only need to cache non-null values - if(value != null) target.put(fld.getPersistentField().getName(), value); + target.put(fld.getPersistentField().getName(), value); } target.put(CLASS_NAME_STR, entry.getObject().getClass().getName()); return new ObjectEntryImpl(target); @@ -165,7 +164,8 @@ Object[] fieldValues = getFieldValues(source, nonCreationFields); // copy main object values - for (int idx = 0; idx < fieldValues.length; idx++) + int length = fieldValues.length; + for (int idx = 0; idx < length; idx++) { nonCreationFields[idx].getPersistentField().set(target, fieldValues[idx]); } @@ -175,7 +175,7 @@ /** * Extracts the java values for the given fields from the given map that contains * data retrieved from the database. - * + * * @param source The map containing the values from the database * @param fields The fields * @return The values --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org