Author: kkolinko Date: Sat Jan 21 09:07:37 2017 New Revision: 1779707 URL: http://svn.apache.org/viewvc?rev=1779707&view=rev Log: For https://bz.apache.org/bugzilla/show_bug.cgi?id=60620 Followup to r1778068: Update include/exclude patterns in Eclipse projects, so that compilation of SafeForkJoinWorkerThreadFactory class is skipped in main tomcat-7.0.x project that is built with java 6.
Add this class to the second project that is built with java 7. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java?rev=1779707&r1=1779706&r2=1779707&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java Sat Jan 21 09:07:37 2017 @@ -27,6 +27,15 @@ import java.util.concurrent.ForkJoinWork * <p> * Note: This class must be available on the boot strap class path for it to be * visible to {@link ForkJoinPool}. + * <p> + * Note: This a helper class that is used by memory leak protection code + * ({@code JreMemoryLeakPreventionListener}) to workaround a bug in + * Oracle Java 7 / Java 8 Java Runtime. See + * <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=60620">bug 60620</a> + * for discussion links. + * + * As {@code ForkJoinPool.ForkJoinWorkerThreadFactory} class is available since + * Java 7 only, compilation of this class is skipped when building Tomcat with Java 6. */ public class SafeForkJoinWorkerThreadFactory implements ForkJoinWorkerThreadFactory { Modified: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath?rev=1779707&r1=1779706&r2=1779707&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath (original) +++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath Sat Jan 21 09:07:37 2017 @@ -16,7 +16,7 @@ limitations under the License. --> <classpath> - <classpathentry including="org/apache/tomcat/websocket/" kind="src" path="java"/> + <classpathentry including="org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory*|org/apache/tomcat/websocket/" kind="src" path="java"/> <classpathentry excluding="deployment/|webapp*/" including="org/apache/catalina/websocket/|org/apache/tomcat/websocket/" kind="src" path="test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> Modified: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1779707&r1=1779706&r2=1779707&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original) +++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Sat Jan 21 09:07:37 2017 @@ -16,7 +16,7 @@ limitations under the License. --> <classpath> - <classpathentry excluding="org/apache/tomcat/websocket/" kind="src" path="java"/> + <classpathentry excluding="org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory*|org/apache/tomcat/websocket/" kind="src" path="java"/> <classpathentry excluding="org/apache/tomcat/websocket/|org/apache/catalina/websocket/|deployment/|webapp*/" kind="src" path="test"/> <classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1779707&r1=1779706&r2=1779707&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jan 21 09:07:37 2017 @@ -58,6 +58,15 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 7.0.76 (violetagg)"> + <subsection name="Other"> + <changelog> + <fix> + <bug>60620</bug>: Fix configuration of Eclipse projects, broken by + introduction of <code>SafeForkJoinWorkerThreadFactory</code> helper + class. This class cannot be built with Java 6. (kkolinko) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 7.0.75 (violetagg)"> <subsection name="Cluster"> @@ -127,6 +136,7 @@ <subsection name="Catalina"> <changelog> <add> + <bug>60620</bug>: Extend the <code>JreMemoryLeakPreventionListener</code> to provide protection against <code>ForkJoinPool.commonPool()</code> related memory leaks. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org