Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 34873 invoked from network); 23 Jun 2010 13:58:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Jun 2010 13:58:49 -0000 Received: (qmail 62868 invoked by uid 500); 23 Jun 2010 13:58:49 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 62799 invoked by uid 500); 23 Jun 2010 13:58:48 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 62791 invoked by uid 99); 23 Jun 2010 13:58:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jun 2010 13:58:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 23 Jun 2010 13:58:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 54D2023888DD; Wed, 23 Jun 2010 13:57:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r957206 - in /db/derby/code/branches/10.5/java/engine/org/apache/derby: iapi/reference/Property.java impl/store/raw/data/BaseDataFileFactory.java Date: Wed, 23 Jun 2010 13:57:52 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100623135752.54D2023888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mamta Date: Wed Jun 23 13:57:51 2010 New Revision: 957206 URL: http://svn.apache.org/viewvc?rev=957206&view=rev Log: Backporting changes for DERBY-4588 from trunk into 10.5 codeline Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/reference/Property.java db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/reference/Property.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/reference/Property.java?rev=957206&r1=957205&r2=957206&view=diff ============================================================================== --- db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/reference/Property.java (original) +++ db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/reference/Property.java Wed Jun 23 13:57:51 2010 @@ -75,6 +75,17 @@ public interface Property { */ String LOG_SEVERITY_LEVEL = "derby.stream.error.logSeverityLevel"; + /** + * derby.stream.error.logBootTrace + *
+ * defaults to false. If set to true logs a stack trace to + * the error stream on successful boot or shutdown. + * This can be useful when trying to debug dual boot + * scenarios especially with multiple class loaders. + * + */ + + String LOG_BOOT_TRACE = "derby.stream.error.logBootTrace"; /** derby.stream.error.file=absolute or relative error log filename Takes precendence over derby.stream.error.method. Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=957206&r1=957205&r2=957206&view=diff ============================================================================== --- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original) +++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Wed Jun 23 13:57:51 2010 @@ -354,7 +354,8 @@ public class BaseDataFileFactory String readOnlyMsg = (isReadOnly()) ? MessageService.getTextMessage(MessageId.STORE_BOOT_READONLY_MSG) : ""; - + boolean logBootTrace = Boolean.valueOf(startParams.getProperty(Property.LOG_BOOT_TRACE, + PropertyUtil.getSystemProperty(Property.LOG_BOOT_TRACE))).booleanValue(); logMsg(CheapDateFormatter.formatDate(bootTime) + MessageService.getTextMessage(MessageId.STORE_BOOT_MSG, jbmsVersion, @@ -364,6 +365,8 @@ public class BaseDataFileFactory (Object) this.getClass().getClassLoader() )); + if (logBootTrace) + Monitor.logThrowable(new Throwable("boot trace")); uf = null; @@ -461,6 +464,7 @@ public class BaseDataFileFactory } long shutdownTime = System.currentTimeMillis(); + boolean logBootTrace = PropertyUtil.getSystemBoolean(Property.LOG_BOOT_TRACE); logMsg("\n" + CheapDateFormatter.formatDate(shutdownTime) + MessageService.getTextMessage( MessageId.STORE_SHUTDOWN_MSG, @@ -469,6 +473,10 @@ public class BaseDataFileFactory // Cast to object so we don't get just the toString() // method (Object) this.getClass().getClassLoader())); + + if (logBootTrace) + Monitor.logThrowable(new Throwable("shutdown trace")); + istream.println(LINE); if (!isCorrupt)