You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ma...@apache.org on 2012/10/04 21:50:05 UTC

svn commit: r1394225 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Author: mamta
Date: Thu Oct  4 19:50:05 2012
New Revision: 1394225

URL: http://svn.apache.org/viewvc?rev=1394225&view=rev
Log:
DERBY-4873 (NullPointerException in testBoundaries with ibm jvm 1.6)

Backporting to 10.6


Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1028633

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1394225&r1=1394224&r2=1394225&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Thu Oct  4 19:50:05 2012
@@ -509,7 +509,7 @@ public class BaseDataFileFactory
 
 		long shutdownTime = System.currentTimeMillis();
 		boolean logBootTrace = PropertyUtil.getSystemBoolean(Property.LOG_BOOT_TRACE);
-		istream.println(LINE);
+		logMsg(LINE);
 		logMsg("\n" + new Date() +
                 MessageService.getTextMessage(
                     MessageId.STORE_SHUTDOWN_MSG,