db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1071164 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Date Wed, 16 Feb 2011 07:15:52 GMT
Author: mamta
Date: Wed Feb 16 07:15:52 2011
New Revision: 1071164

URL: http://svn.apache.org/viewvc?rev=1071164&view=rev
Log:
DERBY-4601 Shutting down just a single database should log a different message than shutting
down the system

Backporting 1024511 into 10.5 codeline. Had to hand fix a diff in BaseDataFileFactory.java.
Will migrate the rest of the commits for DERBY-4601 as separate checkin


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

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 07:15:52 2011
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1071164&r1=1071163&r2=1071164&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Wed Feb 16 07:15:52 2011
@@ -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;
 
@@ -179,13 +180,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");
@@ -222,6 +224,8 @@ abstract class BaseMonitor
 			}
 
 		}
+		
+		Monitor.getStream().println(LINE);
 		((TopService) services.elementAt(0)).shutdown();
 
 		synchronized (dontGC) {

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=1071164&r1=1071163&r2=1071164&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
Wed Feb 16 07:15:52 2011
@@ -481,7 +481,8 @@ public class BaseDataFileFactory
 
 		long shutdownTime = System.currentTimeMillis();
 		boolean logBootTrace = PropertyUtil.getSystemBoolean(Property.LOG_BOOT_TRACE);
-		logMsg("\n" + CheapDateFormatter.formatDate(shutdownTime) +
+		istream.println(LINE);
+		logMsg("\n" + new Date() +
                 MessageService.getTextMessage(
                     MessageId.STORE_SHUTDOWN_MSG,
                     getIdentifier(),
@@ -494,8 +495,6 @@ public class BaseDataFileFactory
 		if (logBootTrace)
 			Monitor.logThrowable(new Throwable("shutdown trace"));
 			
-		istream.println(LINE);
-
 		if (!isCorrupt) 
         {
 			try 



Mime
View raw message