db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1740656 - in /db/derby/code/branches/10.12: ./ java/build/org/apache/derbyBuild/classlister.java
Date Sat, 23 Apr 2016 14:41:57 GMT
Author: rhillegas
Date: Sat Apr 23 14:41:57 2016
New Revision: 1740656

URL: http://svn.apache.org/viewvc?rev=1740656&view=rev
Log:
DERBY-6857: Port 1727680 (derby-6857-04-aa-pruneConstantClasses.diff) from trunk to the 10.12
branch.

Modified:
    db/derby/code/branches/10.12/   (props changed)
    db/derby/code/branches/10.12/java/build/org/apache/derbyBuild/classlister.java

Propchange: db/derby/code/branches/10.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 23 14:41:57 2016
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
 /db/derby/code/branches/10.8:1177474,1234973,1464951
 /db/derby/code/branches/10.9:1373148
-/db/derby/code/trunk:1063809,1702820-1702830,1702836,1738368
+/db/derby/code/trunk:1063809,1702820-1702830,1702836,1727680,1738368

Modified: db/derby/code/branches/10.12/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.12/java/build/org/apache/derbyBuild/classlister.java?rev=1740656&r1=1740655&r2=1740656&view=diff
==============================================================================
--- db/derby/code/branches/10.12/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/branches/10.12/java/build/org/apache/derbyBuild/classlister.java Sat Apr
23 14:41:57 2016
@@ -511,6 +511,22 @@ public class classlister {
 			}
 		}
 
+    //
+    // Exclude classes which are referenced only by the compiler
+    // in order to copy constants into the target class. These were not recorded
+    // in the constant pool by Java compilers at level 7 or earlier.
+    // However, these started turning up under Windows with Java 8
+    // after the base compilation level was changed to Java 8 by the work
+    // on https://issues.apache.org/jira/browse/DERBY-6857. See that issue
+    // for more information.
+    //
+    if (
+        className.startsWith("org.apache.derby.iapi.reference.DRDAConstants") ||
+        className.startsWith("org.apache.derby.shared.common.sanity.SanityState") ||
+        className.startsWith("org.apache.derbyPreBuild.ReleaseProperties")
+        )
+    { return; }
+
 		// already seen class
 		if (foundClasses.get(className) != null)
 			return;



Mime
View raw message