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 km...@apache.org on 2011/08/16 15:03:57 UTC
svn commit: r1158255 - in /db/derby/code/branches/10.8: ./
java/build/org/apache/derbyBuild/classlister.java
Author: kmarsden
Date: Tue Aug 16 13:03:57 2011
New Revision: 1158255
URL: http://svn.apache.org/viewvc?rev=1158255&view=rev
Log:
DERBY-4670 - ThreadDump class included in insane jars
Skip sanity classes in class list for insane builds.
Contributed by Knut Anders Hatlen
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/classlister.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 13:03:57 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146644,1146915,1146962,1148344,1148354,1148658,1151101,1151612
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146644,1146915,1146962,1148344,1148354,1148658,1151101,1151612
Modified: db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/classlister.java?rev=1158255&r1=1158254&r2=1158255&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/classlister.java Tue Aug 16 13:03:57 2011
@@ -22,13 +22,11 @@
package org.apache.derbyBuild;
import org.apache.derby.iapi.services.classfile.*;
-import org.apache.derby.iapi.util.ByteArray;
+import org.apache.derby.iapi.services.sanity.SanityManager;
import java.util.*;
import java.util.zip.*;
import java.io.*;
-import java.io.*;
-
/**
A tool that generates a list of required classes from a
@@ -460,6 +458,13 @@ public class classlister {
return;
}
+ if (!SanityManager.DEBUG &&
+ className.matches("^org\\.apache\\.derby\\..*\\.sanity\\..*"))
+ {
+ // Don't include sanity classes in insane builds.
+ return;
+ }
+
if (ignoreWebLogic)
{
if (className.startsWith("weblogic."))
@@ -577,7 +582,7 @@ public class classlister {
continue;
}
- if (!org.apache.derby.iapi.services.sanity.SanityManager.DEBUG) {
+ if (!SanityManager.DEBUG) {
if (x.indexOf("SanityManager") != -1) {
boolean printSanityWarning = true;