Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D25559968 for ; Wed, 16 Nov 2011 17:06:20 +0000 (UTC) Received: (qmail 45451 invoked by uid 500); 16 Nov 2011 17:06:20 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 45418 invoked by uid 500); 16 Nov 2011 17:06:20 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 45411 invoked by uid 99); 16 Nov 2011 17:06:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 17:06:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 17:06:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3956B23889D7 for ; Wed, 16 Nov 2011 17:05:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1202782 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java Date: Wed, 16 Nov 2011 17:05:57 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111116170557.3956B23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Wed Nov 16 17:05:56 2011 New Revision: 1202782 URL: http://svn.apache.org/viewvc?rev=1202782&view=rev Log: conditional logging to avoid unneeded string conversion of huge snapshot maps Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java?rev=1202782&r1=1202781&r2=1202782&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java Wed Nov 16 17:05:56 2011 @@ -480,11 +480,17 @@ public class DataRowStore implements Ser // case 4 above... have to throw out the snapshot since // no good options exist to tell how to merge the two. if (oldSnapshot.getVersion() != newSnapshot.getReplacesVersion()) { - logger - .debug("snapshot version changed, don't know what to do... Old: " - + oldSnapshot - + ", New: " - + newSnapshot); + + // snapshots can be huge potentially.. so print them only if the + // user is expecting them to be printed + if (logger.isDebugEnabled()) { + logger + .debug("snapshot version changed, don't know what to do... Old: " + + oldSnapshot + + ", New: " + + newSnapshot); + } + forgetSnapshot(key); continue; }