db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1071497 - in /db/derby/code/branches/10.5: ./ java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Date Thu, 17 Feb 2011 03:44:41 GMT
Author: mamta
Date: Thu Feb 17 03:44:41 2011
New Revision: 1071497

URL: http://svn.apache.org/viewvc?rev=1071497&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.4 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.5/   (props changed)
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 03:44:41 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.6:942027,957000,957287,958621,962738,965351,987678,997790*,1031623,1055601,1068474
-/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,965647,96
 6393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,999119,999485,1002291,1002682,1002853,1021426,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250
+/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,965647,96
 6393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,999119,999485,1002291,1002682,1002853,1021426,1024511,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1071497&r1=1071496&r2=1071497&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Thu Feb 17 03:44:41 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.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=1071497&r1=1071496&r2=1071497&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
Thu Feb 17 03:44:41 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