db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1158458 - /db/derby/code/branches/10.6/java/build/org/apache/derbyBuild/classlister.java
Date Tue, 16 Aug 2011 22:00:09 GMT
Author: kmarsden
Date: Tue Aug 16 22:00:08 2011
New Revision: 1158458

URL: http://svn.apache.org/viewvc?rev=1158458&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.6/java/build/org/apache/derbyBuild/classlister.java

Modified: db/derby/code/branches/10.6/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/build/org/apache/derbyBuild/classlister.java?rev=1158458&r1=1158457&r2=1158458&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/branches/10.6/java/build/org/apache/derbyBuild/classlister.java Tue Aug
16 22:00:08 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
@@ -459,6 +457,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."))
@@ -576,7 +581,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