db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1158450 - in /db/derby/code/branches/10.7: ./ java/build/org/apache/derbyBuild/classlister.java
Date Tue, 16 Aug 2011 21:24:06 GMT
Author: kmarsden
Date: Tue Aug 16 21:24:05 2011
New Revision: 1158450

URL: http://svn.apache.org/viewvc?rev=1158450&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.7/   (props changed)
    db/derby/code/branches/10.7/java/build/org/apache/derbyBuild/classlister.java

Propchange: db/derby/code/branches/10.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 21:24:05 2011
@@ -1 +1 @@
-/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076335,1076387,1078461,1078608,1078693,1081072,1081455,1081568,1085078,1091000,1097247,1103681,1103718,1129136,1130632,1130895,1131272,1132664,1136363,1138341,1138444,1139449,1141924
+/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076335,1076387,1078461,1078608,1078693,1081072,1081455,1081568,1085078,1091000,1097247,1103681,1103718,1128243,1129136,1130632,1130895,1131272,1132664,1136363,1138341,1138444,1139449,1141924

Modified: db/derby/code/branches/10.7/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/build/org/apache/derbyBuild/classlister.java?rev=1158450&r1=1158449&r2=1158450&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/branches/10.7/java/build/org/apache/derbyBuild/classlister.java Tue Aug
16 21:24:05 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;



Mime
View raw message