db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r593654 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/build.xml impl/services/monitor/BaseMonitor.java
Date Fri, 09 Nov 2007 21:20:13 GMT
Author: kmarsden
Date: Fri Nov  9 13:20:12 2007
New Revision: 593654

URL: http://svn.apache.org/viewvc?rev=593654&view=rev
Log:
DERBY-1272 Backout change 592590 which was causing Exception initializer error with classes.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=593654&r1=593653&r2=593654&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Fri Nov  9 13:20:12 2007
@@ -54,7 +54,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.engine.src.dir};${derby.tools.src.dir}"
+      srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>

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=593654&r1=593653&r2=593654&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
Fri Nov  9 13:20:12 2007
@@ -1936,18 +1936,6 @@
 
 	private void dumpTempWriter(boolean bothPlaces) {
 
-                // DERBY-1272: Print sysinfo to log if derby.stream.error.logSeverityLevel=0
-                int logSeverityLevel = PropertyUtil.getSystemInt(Property.LOG_SEVERITY_LEVEL,
-                        SanityManager.DEBUG ? 0 : ExceptionSeverity.SESSION_SEVERITY);
-                if (logSeverityLevel == 0) {
-                    if (systemStreams != null) {
-                       systemStreams.stream().printlnWithHeader("");
-                       org.apache.derby.tools.sysinfo.getInfo(systemStreams.stream().getPrintWriter());
-                    } else {
-                       org.apache.derby.tools.sysinfo.getInfo(getTempWriter());
-                    }
-                }
-
 		if (tmpWriter == null)
 			return;
 



Mime
View raw message