db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1024511 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl: services/monitor/BaseMonitor.java store/raw/data/BaseDataFileFactory.java
Date Wed, 20 Oct 2010 03:18:31 GMT
Author: mamta
Date: Wed Oct 20 03:18:29 2010
New Revision: 1024511

URL: http://svn.apache.org/viewvc?rev=1024511&view=rev
Log:
DERBY-4601 Add a line break between the startup and shutdown messages in derby.log


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1024511&r1=1024510&r2=1024511&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Wed Oct 20 03:18:29 2010
@@ -36,6 +36,7 @@ import org.apache.derby.iapi.services.co
 import org.apache.derby.iapi.services.context.Context;
 import org.apache.derby.iapi.services.context.ContextService;
 
+import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
 import org.apache.derby.iapi.services.stream.InfoStreams;
 import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
 
@@ -165,13 +166,14 @@ abstract class BaseMonitor
 				return;
 			inShutdown = true;
 		}
+ 
+		Monitor.getStream().println(LINE);
 		long shutdownTime = System.currentTimeMillis();
 		//Make a note of Engine shutdown in the log file
 		Monitor.getStream().printlnWithHeader("\n" +
 				COLON +
                 MessageService.getTextMessage(
                     MessageId.CONN_SHUT_DOWN_ENGINE));
-		Monitor.getStream().println(LINE);
 
 		if (SanityManager.DEBUG && reportOn) {
 			report("Shutdown request");
@@ -208,6 +210,8 @@ abstract class BaseMonitor
 			}
 
 		}
+		
+		Monitor.getStream().println(LINE);
 		((TopService) services.elementAt(0)).shutdown();
 
 		synchronized (dontGC) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1024511&r1=1024510&r2=1024511&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Wed Oct 20 03:18:29 2010
@@ -468,6 +468,7 @@ public class BaseDataFileFactory
 		}
 
 		boolean logBootTrace = PropertyUtil.getSystemBoolean(Property.LOG_BOOT_TRACE);
+		istream.println(LINE);
 		logMsg("\n" + new Date() +
                 MessageService.getTextMessage(
                     MessageId.STORE_SHUTDOWN_MSG,
@@ -481,8 +482,6 @@ public class BaseDataFileFactory
 		if (logBootTrace)
 			Monitor.logThrowable(new Throwable("shutdown trace"));
 			
-		istream.println(LINE);
-
 		if (!isCorrupt) 
         {
 			try 



Mime
View raw message