Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 28386 invoked from network); 3 Apr 2006 20:09:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Apr 2006 20:09:41 -0000 Received: (qmail 27901 invoked by uid 500); 3 Apr 2006 20:09:41 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 27881 invoked by uid 500); 3 Apr 2006 20:09:40 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 27870 invoked by uid 500); 3 Apr 2006 20:09:40 -0000 Received: (qmail 27867 invoked by uid 99); 3 Apr 2006 20:09:40 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Apr 2006 13:09:40 -0700 X-ASF-Spam-Status: No, hits=-9.4 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; Mon, 03 Apr 2006 13:09:39 -0700 Received: (qmail 28316 invoked by uid 65534); 3 Apr 2006 20:09:18 -0000 Message-ID: <20060403200918.28315.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r391132 - /db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java Date: Mon, 03 Apr 2006 20:09:18 -0000 To: torque-commits@db.apache.org From: tv@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tv Date: Mon Apr 3 13:09:17 2006 New Revision: 391132 URL: http://svn.apache.org/viewcvs?rev=391132&view=rev Log: Attempt to fix the NullPointerException which happens when LargeSelect objects are de-serialized from Tomcat session storage during reload. Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java?rev=391132&r1=391131&r2=391132&view=diff ============================================================================== --- db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java (original) +++ db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java Mon Apr 3 13:09:17 2006 @@ -135,6 +135,9 @@ */ public class LargeSelect implements Runnable, Serializable { + /** Serial version */ + private static final long serialVersionUID = -1166842932571491942L; + /** The number of records that a page consists of. */ private int pageSize; /** The maximum number of records to maintain in memory. */ @@ -1288,7 +1291,12 @@ throws IOException, ClassNotFoundException { inputStream.defaultReadObject(); - startQuery(pageSize); + + // avoid NPE because of Tomcat de-serialization of sessions + if (Torque.isInit()) + { + startQuery(pageSize); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org