DO NOT REPLY [Bug 49972] New: Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 Summary: Double-check idiom. Possible data-race. Product: Tomcat 6 Version: 6.0.29 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Manager application AssignedTo: dev@tomcat.apache.org ReportedBy: sergeyvorob...@google.com r998053 class org/apache/tomcat/util/http/FastHttpDateFormat http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java There is double-check anti-pattern in public static final String getCurrentDate() method on protected static long currentDateGenerated variable Concurrent read on line 112 Concurrent write on line 115 P.S.: Maybe I have mistake with determine component -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 Sergey Vorobyev changed: What|Removed |Added CC||sergeyvorob...@google.com OS/Version||All -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49960] HttpServletRequest.getCharacterEncoding does not break up the Content-Disposition header well.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49960 Tim Whittington changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Tim Whittington 2010-09-22 05:00:53 EDT --- This was fixed in #42119 (in 2007) - updating to a recent 5.5.x (or preferrably to a 6.0.x) will resolve the issue. *** This bug has been marked as a duplicate of bug 42119 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42119] request.getCharacterEncoding misparses charset=UTF-8; xyz=3
https://issues.apache.org/bugzilla/show_bug.cgi?id=42119 Tim Whittington changed: What|Removed |Added CC||nig...@forwardcomputers.co. ||uk --- Comment #2 from Tim Whittington 2010-09-22 05:00:54 EDT --- *** Bug 49960 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48925] ((ServletRequest) request).getLocalAddr() returns "null"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48925 Tim Whittington changed: What|Removed |Added Status|NEW |NEEDINFO -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #1 from Sebb 2010-09-22 06:53:24 EDT --- The currentDateGenerated field is read outside the synch. block, and is not volatile. So if one thread calls getCurrentDate() and updates the field, another thread calling getCurrentDate() may see a stale value. Now a stale value will be smaller than the proper value, so the worst that can happen is that the synch. block is invoked unnecessarily. The synch. block will pick up the true value, and skip the format call if necessary. However, this assumes that the field is only updated by the getCurrentDate() method. As the field is not private, that is not guranteed. Seems to me that the field should be made private, and a comment added to explain why the double-check is OK in this case. If read-only access is needed, a getter could be added for the binary field. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49102] coyote.ajp.Constants - 3 "constant" arrays are mutable
https://issues.apache.org/bugzilla/show_bug.cgi?id=49102 --- Comment #2 from Tim Whittington 2010-09-22 07:02:17 EDT --- We can protect these by converting to enums, but the lookup is about 3 times slower (although .005ns vs 0.014ns is splitting hairs ;). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49942] Possible data-race on NioEndpoint$PollerEvent.interestOps
https://issues.apache.org/bugzilla/show_bug.cgi?id=49942 Sergey Vorobyev changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Sergey Vorobyev 2010-09-22 08:39:53 EDT --- Sorry, I hurry. Now I can not verify data-race with interference mechanism. So issue is invalid. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 konstantin.s.serebry...@gmail.com changed: What|Removed |Added CC||konstantin.s.serebry...@gma ||il.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999929 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Sep 22 13:15:46 2010 New Revision: 29 URL: http://svn.apache.org/viewvc?rev=29&view=rev Log: add release date for 7.0.2 beta, from announcement on tomcat.apache.org Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=29&r1=28&r2=29&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 22 13:15:46 2010 @@ -261,7 +261,7 @@ - + @@ -302,7 +302,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999933 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 22 13:23:35 2010 New Revision: 33 URL: http://svn.apache.org/viewvc?rev=33&view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=33&r1=32&r2=33&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 22 13:23:35 2010 @@ -69,7 +69,7 @@ PATCHES PROPOSED TO BACKPORT: * Add "**/*.pom" to "src.files" patternset in build.xml to fixcrlf container/modules/groupcom/build/mvn/tribes.pom. - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: Index: build/build.xml === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999936 - in /tomcat/tc5.5.x/trunk: build/build.xml container/webapps/docs/changelog.xml
Author: markt Date: Wed Sep 22 13:32:05 2010 New Revision: 36 URL: http://svn.apache.org/viewvc?rev=36&view=rev Log: Ensure POM files have correct line endings in source distributions. (rjung's patch) Modified: tomcat/tc5.5.x/trunk/build/build.xml tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/build/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=36&r1=35&r2=36&view=diff == --- tomcat/tc5.5.x/trunk/build/build.xml (original) +++ tomcat/tc5.5.x/trunk/build/build.xml Wed Sep 22 13:32:05 2010 @@ -134,6 +134,7 @@ + Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=36&r1=35&r2=36&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Sep 22 13:32:05 2010 @@ -38,6 +38,16 @@ + + + + +Ensure POM files have correct line endings in source distributions. +(rjung/markt) + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999937 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 22 13:33:14 2010 New Revision: 37 URL: http://svn.apache.org/viewvc?rev=37&view=rev Log: Remove applied patch Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=37&r1=36&r2=37&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 22 13:33:14 2010 @@ -66,21 +66,3 @@ PATCHES PROPOSED TO BACKPORT: -- see attachment 25657 in BZ 49521, but I do not think that it is worth it.) jim: Also not comfortable with such a change this late in the game regarding default behavior of a stable branch. - -* Add "**/*.pom" to "src.files" patternset in build.xml to fixcrlf - container/modules/groupcom/build/mvn/tribes.pom. - +1: rjung, kkolinko, markt - -1: -Index: build/build.xml -=== build/build.xml(revision 998630) -+++ build/build.xml(working copy) -@@ -134,6 +134,7 @@ - - - -+ - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999941 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/jasper/compiler/ res/ res/META-INF/ res/maven/ webapps/docs/
Author: markt
Date: Wed Sep 22 13:43:53 2010
New Revision: 41
URL: http://svn.apache.org/viewvc?rev=41&view=rev
Log:
Switch to using the Eclipse compiler JAR directly rather than creating it from
the larger JDT download.
Removed:
tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.license
tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice
tomcat/tc6.0.x/trunk/res/maven/jasper-jdt.pom
Modified:
tomcat/tc6.0.x/trunk/LICENSE
tomcat/tc6.0.x/trunk/RELEASE-NOTES
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/eclipse.classpath
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/res/INSTALLLICENSE
tomcat/tc6.0.x/trunk/res/License.rtf
tomcat/tc6.0.x/trunk/res/maven/jasper.pom
tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/tc6.0.x/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/LICENSE?rev=41&r1=40&r2=41&view=diff
==
--- tomcat/tc6.0.x/trunk/LICENSE (original)
+++ tomcat/tc6.0.x/trunk/LICENSE Wed Sep 22 13:43:53 2010
@@ -210,7 +210,7 @@ and license terms. Your use of these sub
conditions of the following licenses.
-For the jasper-jdt.jar component:
+For the Eclipse JDT Java compiler:
Eclipse Public License - v 1.0
Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=41&r1=40&r2=41&view=diff
==
--- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Wed Sep 22 13:43:53 2010
@@ -88,7 +88,7 @@ for use by web applications (by placing
* el-api.jar (EL 2.1 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
-* jasper-jdt.jar (Eclipse JDT 3.3 Java compiler)
+* e...@jdt_version@.jar (Eclipse JDT Java compiler)
* jsp-api.jar (JSP 2.1 API)
* servlet-api.jar (Servlet 2.5 API)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=41&r1=40&r2=41&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 13:43:53 2010
@@ -155,19 +155,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, kfujino
-1:
-* Switch to using ecj.jar directly (smaller download, simpler build, same
- result)
- http://people.apache.org/~markt/patches/2010-08-23-ecj-tc6.patch
- http://svn.apache.org/viewvc?rev=987896&view=rev
- +1: markt, rjung, kkolinko
- -1:
- kkolinko: Regarding the comment added to build.properties.default:
- When changing JDT version, updating TldConfig.java and
TldLocationsCache.java
- is a must, but the following files also mention the JDT version number:
- - res/maven/jasper.pom
- - eclipse.classpath
-
-
* Allow off-line building of the extras packages. Also saves downloading deps
every build
http://people.apache.org/~markt/patches/2010-08-23-offline-extras-tc6.patch
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=41&r1=40&r2=41&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Sep 22 13:43:53 2010
@@ -56,10 +56,19 @@ jaxrpc-src.loc=http://repo1.maven.org/ma
wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar
# - Eclipse JDT, version 3.2 or later -
-jdt.home=${base.path}/eclipse/plugins
-jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+# When updating this, also need to update:
+# - noTldJars in o.a.c.startup.TldConfig
+# - noTldJars in o.a.j.compiler.TldLocationsCache
+# - res/maven/jasper.pom
+# - eclipse.classpath
+jdt.version=3.3.1
+jdt.release=R-3.3.1-200709211145
+jdt.home=${base.path}/ecj-${jdt.version}
+jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
+# The download will be moved to the archive area eventually. We are taking
care of that in advance.
+# Note older JARs were called ecj.jar. Newer JARs are called
ecj-${jdt.version}.jar
+jdt.l
svn commit: r999942 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Sep 22 13:44:12 2010 New Revision: 42 URL: http://svn.apache.org/viewvc?rev=42&view=rev Log: add release date for 5.5.31 Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=42&r1=41&r2=42&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Sep 22 13:44:12 2010 @@ -48,7 +48,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999945 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/core/mbeans-descriptors.xml java/org/apache/catalina/util/Lifecyc
Author: markt
Date: Wed Sep 22 13:48:58 2010
New Revision: 45
URL: http://svn.apache.org/viewvc?rev=45&view=rev
Log:
Provide better web application state information via JMX. A limited back-port
of http://svn.apache.org/viewvc?rev=992245&view=rev that could be extended to
other components that use LifecycleSupport and expose an MBean.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=45&r1=44&r2=45&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 13:48:58 2010
@@ -162,15 +162,6 @@ PATCHES PROPOSED TO BACKPORT:
-1:
rjung: s/vesion/version/g
-* Provide better web application state information via JMX
- A limited back-port of http://svn.apache.org/viewvc?rev=992245&view=rev that
- could be extended to other components that use LifecycleSupport and expose
- an MBean
- http://people.apache.org/~markt/patches/2010-09-03-better-state-info.patch
- +1: markt, kfujino, kkolinko
- -1:
- kkolinko: s/Tomact/Tomcat/
-
* Fix unlockAccept when the soTimeout is -1 (default).
Default conf has soTimeout -1 and that will throw exception if
used in setSoTimeout method.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=45&r1=44&r2=45&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed
Sep 22 13:48:58 2010
@@ -5882,6 +5882,10 @@ public class StandardContext
return 3; // STOPPED
}
+public String getStateName() {
+return lifecycle.getState();
+}
+
/**
* The J2EE Server ObjectName this module is deployed on.
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=45&r1=44&r2=45&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Wed Sep 22 13:48:58 2010
@@ -234,6 +234,10 @@
+
+
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=45&r1=44&r2=45&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
Wed Sep 22 13:48:58 2010
@@ -69,7 +69,13 @@ public final class LifecycleSupport {
private final Object listenersLock = new Object(); // Lock object for
changes to listeners
-
+/**
+ * Tracks the current state of lifecycle object based on the events that
+ * are fired. As far as possible, matches the state names used in Tomcat 7
+ * for consistency.
+ */
+private String state = "NEW";
+
// - Public Methods
@@ -113,6 +119,23 @@ public final class LifecycleSupport {
*/
public void fireLifecycleEvent(String type, Object data) {
+if (Lifecycle.INIT_EVENT.equals(type)) {
+state = "INITIALIZED";
+} else if (Lifecycle.BEFORE_START_EVENT.equals(type)) {
+state = "STARTING_PREP";
+} else if (Lifecycle.START_EVENT.equals(type)) {
+state = "STARTING";
+} else if (Lifecycle.AFTER_START_EVENT.equals(type)) {
+state = "STARTED";
+} else if (Lifecycle.BEFORE_STOP_EVENT.equals(type)) {
+state = "STOPPING_PREP";
+} else if (Lifecycle.STOP_EVENT.equals(type)) {
+state = "STOPPING";
+} else if (Lifecycle.AFTER_STOP_EVENT.equals(type)) {
+state = "STOPPED";
+} else if (Lifecycle.DESTROY_EVENT.equals(type)) {
+state = "DESTROYED";
+}
LifecycleEvent event = new LifecycleEvent(lifecycle, type, data);
LifecycleListener interested[] = listeners;
for (int i = 0; i < interested.length; i++)
@@ -150,5 +173,7 @@ public final c
svn commit: r999946 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 22 13:51:54 2010 New Revision: 46 URL: http://svn.apache.org/viewvc?rev=46&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=46&r1=45&r2=46&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 13:51:54 2010 @@ -166,7 +166,7 @@ PATCHES PROPOSED TO BACKPORT: Default conf has soTimeout -1 and that will throw exception if used in setSoTimeout method. http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprunlockaccept.patch - +1: mturk, kfujino + +1: mturk, kfujino, markt -1: * When a cluster node disappears when using the backup manager, handle the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972
--- Comment #2 from konstantin.s.serebry...@gmail.com 2010-09-22 09:56:49 EDT
---
It looks scarier than that.
In short, see
http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html
Case1:
Thread1 executes:
long now = System.currentTimeMillis();
if ((now - currentDateGenerated) > 1000) {
synchronized (format) {
if ((now - currentDateGenerated) > 1000) {
currentDateGenerated = now;
Thread2 executes:
long now = System.currentTimeMillis();
if ((now - currentDateGenerated) > 1000) {
Thread2 skips the "if" part.
If these were the first calls to this function the return value in Thread2 will
be null.
-
Case2:
Thread1 executes:
currentDate = format.format(new Date(now));
Thread2 goes through fast path and executes
return currentDate;
The object currentDate was not properly published and according to the Java
memory model (if I understand it correctly) may be incomplete.
Of course, in practice you will not see any problem in 99.9% of the cases.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999950 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: markt Date: Wed Sep 22 13:57:12 2010 New Revision: 50 URL: http://svn.apache.org/viewvc?rev=50&view=rev Log: Fix a possible NPE when a parallel request invalidates the session before the current request has a chance to send the replication message. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 13:57:12 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,
svn commit: r999954 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Wed Sep 22 14:10:04 2010 New Revision: 54 URL: http://svn.apache.org/viewvc?rev=54&view=rev Log: Cast a vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=54&r1=53&r2=54&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 14:10:04 2010 @@ -70,7 +70,7 @@ PATCHES PROPOSED TO BACKPORT: Failure of one connector should not leave some connectors started and some ignored https://issues.apache.org/bugzilla/attachment.cgi?id=25633 - +1: kkolinko, markt + +1: kkolinko, markt, mturk -1: * Configure Tomcat to use HttpOnly for session cookies by default @@ -141,9 +141,9 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko -1: kkolinko: I was worried that ELFunctionMapper$PrivilegedGetTccl - should be preloaded in o.a.jasper.security.SecurityClassLoad, + should be preloaded in o.a.jasper.security.SecurityClassLoad, but from debugging it looks that it is called by Tomcat code only - (JspServlet). + (JspServlet). * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521 http://people.apache.org/~kkolinko/patches/2010-07-17_tc6_bug49521.patch @@ -189,7 +189,7 @@ PATCHES PROPOSED TO BACKPORT: -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49924 - When non-primary node changes into a primary node, + When non-primary node changes into a primary node, make sure isPrimarySession is changed to true. http://svn.apache.org/viewvc?view=revision&revision=996778 +1: kfujino - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999956 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Wed Sep 22 14:11:11 2010
New Revision: 56
URL: http://svn.apache.org/viewvc?rev=56&view=rev
Log:
Trim trailing spaces. No functional change
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=56&r1=55&r2=56&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Sep 22 14:11:11 2010
@@ -2448,7 +2448,7 @@ static int init_logger(int rotate, jk_lo
tm_now = localtime(&t);
strftime(log_file_name, sizeof(log_file_name_buf), log_file,
tm_now);
} else {
-/* Otherwise append the number of seconds to the base name */
+/* Otherwise append the number of seconds to the base name */
StringCbPrintf(log_file_name, sizeof(log_file_name_buf), "%s.%d",
log_file, (long)t);
}
} else {
@@ -2494,7 +2494,7 @@ static int JK_METHOD rotate_log_file(jk_
if (log_rotationtime > 0) {
time_t t = time(NULL);
-
+
if (t >= log_next_rotate_time) {
rotate = JK_TRUE;
}
@@ -2531,11 +2531,11 @@ static int JK_METHOD iis_log_to_file(jk_
what[used++] = '\r';
what[used++] = '\n';
what[used] = '\0';
-
+
/* Perform logging within critical section to protect rotation */
JK_ENTER_CS(&(log_cs), rc);
if (rc && rotate_log_file(&l)) {
-/* The rotation process will reallocate the jk_logger_t
structure, so refetch */
+/* The rotation process will reallocate the jk_logger_t
structure, so refetch */
FILE *rotated = ((jk_file_logger_t
*)l->logger_private)->logfile;
fputs(what, rotated);
fflush(rotated);
@@ -2550,7 +2550,7 @@ static int init_jk(char *serverName)
{
char shm_name[MAX_PATH];
int rc = JK_FALSE;
-
+
init_logger(JK_FALSE, &logger);
/* TODO: Use System logging to notify the user that
* we cannot open the configured log file.
@@ -2618,7 +2618,7 @@ static int init_jk(char *serverName)
}
if ((log_rotationtime > 0) && (log_filesize > 0)) {
-jk_log(logger, JK_LOG_WARNING,
+jk_log(logger, JK_LOG_WARNING,
"%s is defined in configuration, but will be ignored because %s is
set. ",
LOG_FILESIZE_TAG, LOG_ROTATION_TIME_TAG);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Using JDK compiler with Tomcat (was: Re: svn commit: r999941)
> --- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original) > +++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 13:43:53 > 2010 > @@ -192,7 +192,7 @@ tens of JARs. On fast servers, this will > for even large JSP pages. > > Apache Ant, which was used in previous Tomcat releases, can be used > instead > -of the new compiler by simply removing the lib/jasper-jdt.jar > file, > +of the new compiler by simply removing the lib/ecj-*.jar file, > and placing the ant.jar file from the latest Ant distribution in > the lib folder. If you do this, you also need to use the > "javac" > argument to catalina.sh. > Rereading the above doc fragment, > If you do this, you also need to use the "javac" > argument to catalina.sh. I do not see any support for "javac" argument in the current *.sh/*.bat files of 6.0.x and 5.5.x. It looks that that phrase can be removed. Am I missing anything else? Reading "Using Jikes" part there, http://tomcat.apache.org/tomcat-5.5-doc/jasper-howto.html#Using_Jikes maybe it means, that one has to edit conf/web.xml and set the "compiler" parameter of JspServlet to the value of "javac"? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999958 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 22 14:12:26 2010 New Revision: 58 URL: http://svn.apache.org/viewvc?rev=58&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=58&r1=57&r2=58&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 14:12:26 2010 @@ -192,5 +192,5 @@ PATCHES PROPOSED TO BACKPORT: When non-primary node changes into a primary node, make sure isPrimarySession is changed to true. http://svn.apache.org/viewvc?view=revision&revision=996778 - +1: kfujino + +1: kfujino, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999961 - /tomcat/jk/trunk/native/iis/isapi.def
Author: mturk Date: Wed Sep 22 14:15:15 2010 New Revision: 61 URL: http://svn.apache.org/viewvc?rev=61&view=rev Log: Add ASL header Modified: tomcat/jk/trunk/native/iis/isapi.def Modified: tomcat/jk/trunk/native/iis/isapi.def URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi.def?rev=61&r1=60&r2=61&view=diff == --- tomcat/jk/trunk/native/iis/isapi.def (original) +++ tomcat/jk/trunk/native/iis/isapi.def Wed Sep 22 14:15:15 2010 @@ -1,9 +1,24 @@ +; Licensed to the Apache Software Foundation (ASF) under one or more +; contributor license agreements. See the NOTICE file distributed with +; this work for additional information regarding copyright ownership. +; The ASF licenses this file to You under the Apache License, Version 2.0 +; (the "License"); you may not use this file except in compliance with +; the License. You may obtain a copy of the License at +; +; http://www.apache.org/licenses/LICENSE-2.0 +; +; Unless required by applicable law or agreed to in writing, software +; distributed under the License is distributed on an "AS IS" BASIS, +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +; See the License for the specific language governing permissions and +; limitations under the License. +; LIBRARY "isapi_redirect" EXPORTS HttpFilterProc GetFilterVersion GetExtensionVersion - HttpExtensionProc + HttpExtensionProc TerminateFilter TerminateExtension - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999963 - in /tomcat/jk/trunk/native/iis/pcre: libpcre.def libpcreposix.def
Author: mturk Date: Wed Sep 22 14:15:54 2010 New Revision: 63 URL: http://svn.apache.org/viewvc?rev=63&view=rev Log: Add ASL header Modified: tomcat/jk/trunk/native/iis/pcre/libpcre.def tomcat/jk/trunk/native/iis/pcre/libpcreposix.def Modified: tomcat/jk/trunk/native/iis/pcre/libpcre.def URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/libpcre.def?rev=63&r1=62&r2=63&view=diff == --- tomcat/jk/trunk/native/iis/pcre/libpcre.def (original) +++ tomcat/jk/trunk/native/iis/pcre/libpcre.def Wed Sep 22 14:15:54 2010 @@ -1,3 +1,18 @@ +; Licensed to the Apache Software Foundation (ASF) under one or more +; contributor license agreements. See the NOTICE file distributed with +; this work for additional information regarding copyright ownership. +; The ASF licenses this file to You under the Apache License, Version 2.0 +; (the "License"); you may not use this file except in compliance with +; the License. You may obtain a copy of the License at +; +; http://www.apache.org/licenses/LICENSE-2.0 +; +; Unless required by applicable law or agreed to in writing, software +; distributed under the License is distributed on an "AS IS" BASIS, +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +; See the License for the specific language governing permissions and +; limitations under the License. +; LIBRARY libpcre EXPORTS pcre_malloc Modified: tomcat/jk/trunk/native/iis/pcre/libpcreposix.def URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/libpcreposix.def?rev=63&r1=62&r2=63&view=diff == --- tomcat/jk/trunk/native/iis/pcre/libpcreposix.def (original) +++ tomcat/jk/trunk/native/iis/pcre/libpcreposix.def Wed Sep 22 14:15:54 2010 @@ -1,3 +1,18 @@ +; Licensed to the Apache Software Foundation (ASF) under one or more +; contributor license agreements. See the NOTICE file distributed with +; this work for additional information regarding copyright ownership. +; The ASF licenses this file to You under the Apache License, Version 2.0 +; (the "License"); you may not use this file except in compliance with +; the License. You may obtain a copy of the License at +; +; http://www.apache.org/licenses/LICENSE-2.0 +; +; Unless required by applicable law or agreed to in writing, software +; distributed under the License is distributed on an "AS IS" BASIS, +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +; See the License for the specific language governing permissions and +; limitations under the License. +; LIBRARY libpcreposix EXPORTS pcre_malloc - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Using JDK compiler with Tomcat (was: Re: svn commit: r999941)
On 22/09/2010 07:11, Konstantin Kolinko wrote: >> --- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original) >> +++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 13:43:53 >> 2010 >> @@ -192,7 +192,7 @@ tens of JARs. On fast servers, this will >> for even large JSP pages. >> >> Apache Ant, which was used in previous Tomcat releases, can be used >> instead >> -of the new compiler by simply removing the lib/jasper-jdt.jar >> file, >> +of the new compiler by simply removing the lib/ecj-*.jar file, >> and placing the ant.jar file from the latest Ant distribution >> in >> the lib folder. If you do this, you also need to use the >> "javac" >> argument to catalina.sh. >> > > Rereading the above doc fragment, > >> If you do this, you also need to use the "javac" >> argument to catalina.sh. > > I do not see any support for "javac" argument in the current > *.sh/*.bat files of 6.0.x and 5.5.x. > > It looks that that phrase can be removed. Yep. http://svn.apache.org/viewvc?rev=793372&view=rev sheds a little light on this. I'll clean up that part of the docs in trunk and 6.0.x. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999966 - /tomcat/trunk/webapps/docs/jasper-howto.xml
Author: markt Date: Wed Sep 22 14:18:48 2010 New Revision: 66 URL: http://svn.apache.org/viewvc?rev=66&view=rev Log: Delete reference to option that was previously removed. Modified: tomcat/trunk/webapps/docs/jasper-howto.xml Modified: tomcat/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=66&r1=65&r2=66&view=diff == --- tomcat/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 14:18:48 2010 @@ -200,8 +200,7 @@ for even large JSP pages. Apache Ant, which was used in previous Tomcat releases, can be used instead of the new compiler by simply removing the lib/ecj-*.jar file, and placing the ant.jar file from the latest Ant distribution in -the lib folder. If you do this, you also need to use the "javac" -argument to catalina.sh. +the lib folder. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #3 from Chuck Caldarale 2010-09-22 10:20:36 EDT --- (In reply to comment #2) > It looks scarier than that. > In short, see > http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html Not all double-checked locking is evil. The simple fix is to just reverse these two lines: currentDateGenerated = now; currentDate = format.format(new Date(now)); By setting currentDate prior to currentDateGenerated, the potential of returning null is eliminated, and unnecessary locking is still avoided. (This is in addition to making the field private, as Sebb noted.) Case 2 is not a problem; the Java language spec requires operations to be visible to other threads in program order, so the all operations for building the new formatted String must be complete before the reference to it is stored in the field. - Chuck -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Using JDK compiler with Tomcat (was: Re: svn commit: r999941)
On 22/09/2010 07:16, Mark Thomas wrote: > On 22/09/2010 07:11, Konstantin Kolinko wrote: >>> --- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original) >>> +++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 13:43:53 >>> 2010 >>> @@ -192,7 +192,7 @@ tens of JARs. On fast servers, this will >>> for even large JSP pages. >>> >>> Apache Ant, which was used in previous Tomcat releases, can be used >>> instead >>> -of the new compiler by simply removing the lib/jasper-jdt.jar >>> file, >>> +of the new compiler by simply removing the lib/ecj-*.jar file, >>> and placing the ant.jar file from the latest Ant distribution >>> in >>> the lib folder. If you do this, you also need to use the >>> "javac" >>> argument to catalina.sh. >>> >> >> Rereading the above doc fragment, >> >>> If you do this, you also need to use the "javac" >>> argument to catalina.sh. >> >> I do not see any support for "javac" argument in the current >> *.sh/*.bat files of 6.0.x and 5.5.x. >> >> It looks that that phrase can be removed. > > Yep. http://svn.apache.org/viewvc?rev=793372&view=rev sheds a little > light on this. I'll clean up that part of the docs in trunk and 6.0.x. Looking at this some more, I wonder if JSP compilation with Ant is even possible without tools.jar? I'll do some testing... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999970 - /tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
Author: markt Date: Wed Sep 22 14:22:00 2010 New Revision: 70 URL: http://svn.apache.org/viewvc?rev=70&view=rev Log: Delete reference to option that was previously removed. Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml?rev=70&r1=69&r2=70&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 14:22:00 2010 @@ -194,8 +194,7 @@ for even large JSP pages. Apache Ant, which was used in previous Tomcat releases, can be used instead of the new compiler by simply removing the lib/ecj-*.jar file, and placing the ant.jar file from the latest Ant distribution in -the lib folder. If you do this, you also need to use the "javac" -argument to catalina.sh. +the lib folder. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999972 - /tomcat/trunk/webapps/docs/changelog.xml
Author: mturk Date: Wed Sep 22 14:22:48 2010 New Revision: 72 URL: http://svn.apache.org/viewvc?rev=72&view=rev Log: Add connector wait for shutdown to changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=72&r1=71&r2=72&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 22 14:22:48 2010 @@ -29,7 +29,7 @@ Rainer Jung Konstantin Kolinko Peter Rossbach -Keiichi Fujino +Keiichi Fujino Changelog @@ -56,7 +56,7 @@ if it times out. (markt) -49714: The annotation process of Jar doesn't influence +49714: The annotation process of Jar doesn't influence distributable element of web.xml. (kfujino) @@ -86,7 +86,7 @@ 49779: Improve handling of POST requests and FORM authentication, particularly when the user agent responds to the 302 response by repeating the POST request including a request body. Any -request body provided at this point is now swallowed. (markt) +request body provided at this point is now swallowed. (markt) CSRF prevention filter did not correctly handle URLs that used anchors. @@ -100,7 +100,7 @@ More tweaks to the Lifecycle refactoring to ensure that when a component is being destroyed, the destroy method is only called once on each -child component. (markt) +child component. (markt) 48967: Replace strings "catalina.base" and "catalina.home" @@ -108,7 +108,7 @@ Keep the MBean names for web applications consistent between Tomcat 6 -and Tomcat 7. (markt) +and Tomcat 7. (markt) 49865: Tomcat failed to start if catalina.properties was not @@ -116,7 +116,7 @@ 49876: Fix the generics warnings in the copied Apache Jakarta -BCEL code. Based on a patch by Gábor. (markt) +BCEL code. Based on a patch by Gábor. (markt) 49883: Ensure that the CombinedRealm and LockOutRealm return @@ -125,7 +125,7 @@ Update the version numbers in ServerInfo defaults to Tomact 7.0.x. -(markt) +(markt) 49892: Correct JNDI name for method resource injections. @@ -148,6 +148,9 @@ + +Wait for the connectors to exit before closing them down. (mturk) + Follow up to 48545. Make JSSE connectors more tolerant of a incorrect trust store password. (markt) @@ -196,15 +199,15 @@ -Remove domainReplication attribute from ClusterManager. -If you send session to only same domain, use DomainFilterInterceptor. +Remove domainReplication attribute from ClusterManager. +If you send session to only same domain, use DomainFilterInterceptor. (kfujino) Add Null check when CHANGE_SESSION_ID message received. (kfujino) -Add support for LAST_ACCESS_AT_START system property to DeltaSession. +Add support for LAST_ACCESS_AT_START system property to DeltaSession. (kfujino) @@ -213,7 +216,7 @@ message. (markt) -49924: When non-primary node changes into a primary node, +49924: When non-primary node changes into a primary node, make sure isPrimarySession is changed to true. (kfujino) @@ -249,7 +252,7 @@ Correct the Eclipse compiler dependency in the Jasper POM. (markt) -Extend Checkstyle validation checks to check import order. (markt) +Extend Checkstyle validation checks to check import order. (markt) 49758: Fix generics warnings exposed by a fix in Eclipse 3.6. @@ -290,10 +293,10 @@ Extend Checkstyle validation checks to check for tabs in nearly all text -files. (markt) +files. (markt) -Update Commons Daemon from 1.0.2 to 1.0.3.(markt) +Update Commons Daemon from 1.0.2 to 1.0.3.(markt) Update Eclipse JDT Core Batch Compiler (ecj.jar) from 3.5.1 to 3.6. @@ -318,7 +321,7 @@ When using a Loader configured with searchExternalFirst="true" failure to find the class in an external repository should not prevent searching of the -local repositories. (markt) +local repositories. (markt) Add entryPoint support to the CSRF prevention filter. (markt) @@ -431,17 +434,17 @@ configurable. (markt) -Avoid NullPoi
svn commit: r999976 - in /tomcat/trunk/res: main.ico uninst.ico
Author: mturk Date: Wed Sep 22 14:29:07 2010 New Revision: 76 URL: http://svn.apache.org/viewvc?rev=76&view=rev Log: Use *modern* types of nsis install/uninstall icons Modified: tomcat/trunk/res/main.ico tomcat/trunk/res/uninst.ico Modified: tomcat/trunk/res/main.ico URL: http://svn.apache.org/viewvc/tomcat/trunk/res/main.ico?rev=76&r1=75&r2=76&view=diff == Binary files - no diff available. Modified: tomcat/trunk/res/uninst.ico URL: http://svn.apache.org/viewvc/tomcat/trunk/res/uninst.ico?rev=76&r1=75&r2=76&view=diff == Binary files - no diff available. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999978 - /tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
Author: markt Date: Wed Sep 22 14:33:25 2010 New Revision: 78 URL: http://svn.apache.org/viewvc?rev=78&view=rev Log: Need ant-launcher.jar to compile JSPs with Ant rather than ECJ Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml?rev=78&r1=77&r2=78&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 14:33:25 2010 @@ -193,8 +193,8 @@ for even large JSP pages. Apache Ant, which was used in previous Tomcat releases, can be used instead of the new compiler by simply removing the lib/ecj-*.jar file, -and placing the ant.jar file from the latest Ant distribution in -the lib folder. +and placing the ant.jar and ant-launcher.jar files +from the latest Ant distribution in the lib folder. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999979 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Wed Sep 22 14:34:13 2010 New Revision: 79 URL: http://svn.apache.org/viewvc?rev=79&view=rev Log: Mark the proposed patch for backport Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=79&r1=78&r2=79&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 14:34:13 2010 @@ -28,6 +28,13 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] +* Fix unlockAccept when the soTimeout is -1 (default). + Default conf has soTimeout -1 and that will throw exception if + used in setSoTimeout method. + http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprunlockaccept.patch + +1: mturk, kfujino, markt + -1: + PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] @@ -162,13 +169,6 @@ PATCHES PROPOSED TO BACKPORT: -1: rjung: s/vesion/version/g -* Fix unlockAccept when the soTimeout is -1 (default). - Default conf has soTimeout -1 and that will throw exception if - used in setSoTimeout method. - http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprunlockaccept.patch - +1: mturk, kfujino, markt - -1: - * When a cluster node disappears when using the backup manager, handle the failed ping message rather than propagating the exception (which just logs the stack trace but doesn't do anything to deal with the failure) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999980 - /tomcat/trunk/webapps/docs/jasper-howto.xml
Author: markt Date: Wed Sep 22 14:34:23 2010 New Revision: 80 URL: http://svn.apache.org/viewvc?rev=80&view=rev Log: Need ant-launcher.jar to compile JSPs with Ant rather than ECJ Modified: tomcat/trunk/webapps/docs/jasper-howto.xml Modified: tomcat/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=80&r1=79&r2=80&view=diff == --- tomcat/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Sep 22 14:34:23 2010 @@ -198,9 +198,9 @@ tens of JARs. On fast servers, this will for even large JSP pages. Apache Ant, which was used in previous Tomcat releases, can be used instead -of the new compiler by simply removing the lib/ecj-*.jar file, -and placing the ant.jar file from the latest Ant distribution in -the lib folder. +of the new compiler by simply removing the lib/ecj-*.jar file, +and placing the ant.jar and ant-launcher.jar files +from the latest Ant distribution in the lib folder. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Using JDK compiler with Tomcat (was: Re: svn commit: r999941)
On 22/09/2010 07:21, Mark Thomas wrote: > Looking at this some more, I wonder if JSP compilation with Ant is even > possible without tools.jar? I'll do some testing... It is, as long as ant-launcher.jar is in the lib directory. I've updated the docs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999983 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: mturk
Date: Wed Sep 22 14:36:59 2010
New Revision: 83
URL: http://svn.apache.org/viewvc?rev=83&view=rev
Log:
Backport the unlockAccept
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=83&r1=82&r2=83&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 14:36:59 2010
@@ -28,13 +28,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Fix unlockAccept when the soTimeout is -1 (default).
- Default conf has soTimeout -1 and that will throw exception if
- used in setSoTimeout method.
-
http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprunlockaccept.patch
- +1: mturk, kfujino, markt
- -1:
-
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=83&r1=82&r2=83&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Sep 22 14:36:59 2010
@@ -901,7 +901,7 @@ public class AprEndpoint {
saddr = new InetSocketAddress(address,port);
}
s = new java.net.Socket();
-s.setSoTimeout(soTimeout);
+s.setSoTimeout(soTimeout > 0 ? soTimeout : 6);
s.setSoLinger(true ,0);
if (log.isDebugEnabled()) {
log.debug("About to unlock socket for: " + saddr);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=83&r1=82&r2=83&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 22 14:36:59 2010
@@ -78,6 +78,10 @@
+
+Avoid a NPE for APR connector unlockAccept with default soTimeout
+(mturk).
+
48738: Add support for flushing gzipped output. Based on a
patch by Jiong Wang. (markt)
@@ -92,7 +96,7 @@
-49343: When ChannelException is thrown, remove listener
from
+49343: When ChannelException is thrown, remove listener from
channel. (kfujino)
@@ -112,7 +116,7 @@
Use native line endings for example Eclipse configuration files in
-source distribution. (markt)
+source distribution. (markt)
@@ -132,7 +136,7 @@
49598: When session is changed and the session cookie is
replaced, ensure that the new Set-Cookie header overwrites the old
-Set-Cookie header. (markt)
+Set-Cookie header. (markt)
Fix order when listing Webapp loader search URLs. (rjung)
@@ -287,11 +291,11 @@
Clerc. (markt)
-49018: Fix processing of time argument in the Expire
sessions
+49018: Fix processing of time argument in the Expire
sessions
action in the Manager web application. (kkolinko)
-49116: If session is already invalid, expire session to
+49116: If session is already invalid, expire session to
prevent memory leak. (kfujino)
@@ -404,11 +408,11 @@
permanently disabled session replication. (fhanik)
-49051: memberAlive is not called if member has not already
+49051: memberAlive is not called if member has not already
existed in membership. (kfujino)
-49151: Avoid ClassCastException in BackupManager#stop.
+49151: Avoid ClassCastException in BackupManager#stop.
(kfujino)
@@ -492,7 +496,7 @@
48584: Prevent the APR connector logging an error if the
-acceptor fails during shutdown since this is expected. (mturk)
+acceptor fails during shutdown since this is expected. (mturk)
48660: Using compression should not overwrite any Vary
header
@@ -507,7 +511,7 @@
correct location when using JspC and allow the option that controls
this
to be configured on the command line. Also allow the encoding of
web.xml
to be configured when using JspC and deprecate some unused
svn commit: r999985 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: mturk Date: Wed Sep 22 14:38:58 2010 New Revision: 85 URL: http://svn.apache.org/viewvc?rev=85&view=rev Log: Add my persona to the @authors Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=85&r1=84&r2=85&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 22 14:38:58 2010 @@ -32,6 +32,7 @@ Konstantin Kolinko Jean-Frederic Clere Keiichi Fujino +Mladen Turk Changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatOnMacOS" by SorinSbarnea
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatOnMacOS" page has been changed by SorinSbarnea. http://wiki.apache.org/tomcat/TomcatOnMacOS?action=diff&rev1=22&rev2=23 -- - == Running Tomcat on Macintosh OS X == + == Running Tomcat on Mac OS X == + + For an updated guide for installing Tomcat 5/6 on Mac OS X 10.6 using MacPorts check http://serverfault.com/questions/183496/full-guide-for-installing-tomcat-on-os-x [See below for later updates to this 2004 posting] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r999995 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Sep 22 14:47:16 2010 New Revision: 95 URL: http://svn.apache.org/viewvc?rev=95&view=rev Log: Fix typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=95&r1=94&r2=95&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 22 14:47:16 2010 @@ -124,7 +124,7 @@ UnsupportedOperationException. (markt) -Update the version numbers in ServerInfo defaults to Tomact 7.0.x. +Update the version numbers in ServerInfo defaults to Tomcat 7.0.x. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1000003 - /tomcat/trunk/webapps/docs/logging.xml
Author: kkolinko Date: Wed Sep 22 14:48:53 2010 New Revision: 103 URL: http://svn.apache.org/viewvc?rev=103&view=rev Log: Improving the documentation for logging configuration in Apache Tomcat Modified: tomcat/trunk/webapps/docs/logging.xml Modified: tomcat/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=103&r1=102&r2=103&view=diff == --- tomcat/trunk/webapps/docs/logging.xml (original) +++ tomcat/trunk/webapps/docs/logging.xml Wed Sep 22 14:48:53 2010 @@ -37,22 +37,19 @@ Tomcat uses - http://commons.apache.org/logging";>Commons Logging - throughout its internal code allowing the - developer to choose a logging configuration that suits their needs, e.g - java.util.logging or - http://logging.apache.org/log4j";>Log4J. + http://commons.apache.org/logging";>Apache Commons Logging + throughout its internal code. Commons Logging provides Tomcat with the ability to log hierarchically across various log levels without needing to rely on a - particular logging implementation. + particular logging implementation. By default, only java.util.logging is available for the logs generated by the Tomcat internal loggers, as Tomcat uses a package renamed commons logging implementation which is hardcoded to use java.util.logging. Use of - alternative logging frameworks requires building or downloading the - extras components which include a full + alternative logging frameworks requires building or downloading an + extras component which include a full commons-logging implementation. Instructions for configuring the extras components to enable log4j to be used for Tomcat's internal logging may be found below. @@ -62,12 +59,12 @@ Tomcat no longer uses localhost_log as the runtime exception/stack trace log. These types of error are usually thrown by uncaught exceptions, but are still valuable to the developer. They can now - be found in the stdout log. + be found in the stdout log file (catalina.out). - + The default implementation of java.util.logging provided in the JDK is too @@ -225,7 +222,7 @@ java.util.logging.ConsoleHandler.formatt - + This section explains how to configure Tomcat to use log4j rather than java.util.logging for all Tomcat's internal logging. The following steps - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #4 from Kostya Serebryany 2010-09-22 10:53:58 EDT --- >> The simple fix is to just reverse these two lines: I afraid, it won't work. The compiler is free to reverse these lines back. (maybe not in this particular case, but certainly in general). >> the Java language spec requires operations to be visible to other threads in >> program order Does it? (I am a C++ guy, could you point me to the place in Java docs where this is stated?) >From what I can see, the order is guaranteed only in the presence of happens-before relation (volatile write followed by volatile read or a mutex unlock followed by a mutex lock). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1000014 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/jk/common/ webapps/docs/
Author: markt
Date: Wed Sep 22 14:56:26 2010
New Revision: 114
URL: http://svn.apache.org/viewvc?rev=114&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030
Failure of one connector should not leave some connectors started and some
ignored
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=114&r1=113&r2=114&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 14:56:26 2010
@@ -66,13 +66,6 @@ PATCHES PROPOSED TO BACKPORT:
system property, but defaults to the old behaviour.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030
- Failure of one connector should not leave some connectors started and some
- ignored
- https://issues.apache.org/bugzilla/attachment.cgi?id=25633
- +1: kkolinko, markt, mturk
- -1:
-
* Configure Tomcat to use HttpOnly for session cookies by default
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_context_httpOnly.patch
+1: kkolinko
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=114&r1=113&r2=114&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Wed
Sep 22 14:56:26 2010
@@ -18,7 +18,6 @@
package org.apache.catalina.connector;
-import java.net.URLEncoder;
import java.util.HashMap;
import javax.management.MBeanRegistration;
@@ -1259,4 +1258,18 @@ public class Connector
getService().removeConnector(this);
}
+/**
+ * Provide a useful toString() implementation as it may be used when
logging
+ * Lifecycle errors to identify the component.
+ */
+@Override
+public String toString() {
+// Not worth caching this right now
+StringBuilder sb = new StringBuilder("Connector[");
+sb.append(getProtocol());
+sb.append('-');
+sb.append(getPort());
+sb.append(']');
+return sb.toString();
+}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=114&r1=113&r2=114&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
Wed Sep 22 14:56:26 2010
@@ -169,8 +169,10 @@ public class MapperListener
* unregister this from JMImplementation:type=MBeanServerDelegate
*/
public void destroy() {
+if (mBeanServer == null) {
+return;
+}
try {
-
ObjectName objectName = new ObjectName(
"JMImplementation:type=MBeanServerDelegate");
mBeanServer.removeNotificationListener(objectName, this);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=114&r1=113&r2=114&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Wed Sep 22 14:56:26 2010
@@ -179,6 +179,10 @@ standardServer.initialize.initialized=Th
standardServer.start.connectors=At least one connector is not associated with
any container
standardServer.start.started=This server has already been started
standardServer.stop.notStarted=This server has not yet been started
+standardService.connector.initFailed=Failed to initialize connector [{0}]
+standardService.connector.pauseFailed=Failed to pause connector [{0}]
+standardService.connector.startFailed=Failed to start connector [{0}]
+standardService.connector.stopFailed=Failed to stop connector [{0}]
standardService.initialize.initialized=This service has already been
initialized
standar
DO NOT REPLY [Bug 49030] Processing of Tomcat Connector configuration can leave some connectors uninitialized
https://issues.apache.org/bugzilla/show_bug.cgi?id=49030 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas 2010-09-22 10:56:47 EDT --- This has been fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1000003 - /tomcat/trunk/webapps/docs/logging.xml
> From: kkoli...@apache.org [mailto:kkoli...@apache.org] > Subject: svn commit: r103 - /tomcat/trunk/webapps/docs/logging.xml > @@ -62,12 +59,12 @@ >Tomcat no longer uses localhost_log as the runtime >exception/stack trace log. These types of error are usually thrown by >uncaught exceptions, but are still valuable to the developer. They can > now > - be found in the stdout log. > + be found in the stdout log file > (catalina.out). The catalina.out file isn't created on Windows. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers.
svn commit: r1000020 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jk/common/ChannelNioSocket.java java/org/apache/jk/common/ChannelSocket.java java/org/apache/jk/server/JkMain.java webapps/d
Author: markt
Date: Wed Sep 22 15:03:28 2010
New Revision: 120
URL: http://svn.apache.org/viewvc?rev=120&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521
- Disable scanning for a free port in Jk AJP/1.3 connector by default.
- Do not change maxPort field value of ChannelSocket in its #setPort()
and #init() methods.
- Add support for "maxPort" attribute on a element as a synonym
for channelSocket.maxPort
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=120&r1=119&r2=120&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 22 15:03:28 2010
@@ -138,16 +138,6 @@ PATCHES PROPOSED TO BACKPORT:
but from debugging it looks that it is called by Tomcat code only
(JspServlet).
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521
- http://people.apache.org/~kkolinko/patches/2010-07-17_tc6_bug49521.patch
- - Disable scanning for a free port in Jk AJP/1.3 connector by default.
- - Do not change maxPort field value of ChannelSocket in its #setPort()
-and #init() methods.
- - Add support for "maxPort" attribute on a element as a synonym
-for channelSocket.maxPort
- +1: kkolinko, markt, kfujino
- -1:
-
* Allow off-line building of the extras packages. Also saves downloading deps
every build
http://people.apache.org/~markt/patches/2010-08-23-offline-extras-tc6.patch
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java?rev=120&r1=119&r2=120&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java Wed
Sep 22 15:03:28 2010
@@ -91,7 +91,7 @@ public class ChannelNioSocket extends Jk
org.apache.juli.logging.LogFactory.getLog( ChannelNioSocket.class );
private int startPort=8009;
-private int maxPort=8019; // 0 for backward compat.
+private int maxPort=0; // 0 disables free port scanning
private int port=startPort;
private InetAddress inet;
private int serverTimeout = 0;
@@ -142,7 +142,6 @@ public class ChannelNioSocket extends Jk
public void setPort( int port ) {
this.startPort=port;
this.port=port;
-this.maxPort=port+10;
}
public int getPort() {
@@ -386,11 +385,12 @@ public class ChannelNioSocket extends Jk
running = true;
return;
}
-if (maxPort < startPort)
-maxPort = startPort;
+int endPort = maxPort;
+if (endPort < startPort)
+endPort = startPort;
ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.configureBlocking(false);
-for( int i=startPort; i<=maxPort; i++ ) {
+for( int i=startPort; i<=endPort; i++ ) {
try {
InetSocketAddress iddr = null;
if( inet == null ) {
@@ -410,7 +410,7 @@ public class ChannelNioSocket extends Jk
}
if( sSocket==null ) {
-log.error("Can't find free port " + startPort + " " + maxPort );
+log.error("Can't find free port " + startPort + " " + endPort );
return;
}
if(log.isInfoEnabled())
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=120&r1=119&r2=120&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Wed Sep
22 15:03:28 2010
@@ -81,7 +81,7 @@ public class ChannelSocket extends JkHan
org.apache.juli.logging.LogFactory.getLog( ChannelSocket.class );
private int startPort=8009;
-private int maxPort=8019; // 0 for backward compat.
+private int maxPort=0; // 0 disables free port scanning
private int port=startPort;
private int backlog = 0;
private InetAddress inet;
@@ -125,7 +125,6 @@ public class ChannelSocket extends JkHan
public void setPort( int port ) {
this.startPort=port;
this.port=port;
-this.maxPort=port+10;
}
public int getPort() {
@@ -367,9 +366,
DO NOT REPLY [Bug 49521] Fix ordering issues in setting channelSocket.maxPort
https://issues.apache.org/bugzilla/show_bug.cgi?id=49521 Mark Thomas changed: What|Removed |Added Component|Connectors |Connector:Coyote Version|6.0.26 |5.5.31 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #3 from Mark Thomas 2010-09-22 11:04:17 EDT --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1000003 - /tomcat/trunk/webapps/docs/logging.xml
2010/9/22 Caldarale, Charles R : >> From: kkoli...@apache.org [mailto:kkoli...@apache.org] >> Subject: svn commit: r103 - /tomcat/trunk/webapps/docs/logging.xml > >> @@ -62,12 +59,12 @@ >> Tomcat no longer uses localhost_log as the runtime >> exception/stack trace log. These types of error are usually thrown by >> uncaught exceptions, but are still valuable to the developer. They >> can now >> - be found in the stdout log. >> + be found in the stdout log file >> (catalina.out). > > The catalina.out file isn't created on Windows. > IMHO, "catalina.out" has to be mentioned somewhere on that page. As some start I added it there. Better text is welcome. BTW, the whole phrase seems strange. I think it says about java.lang.ThreadGroup.uncaughtException() which prints to System.err by default. The exceptions that are caught by Tomcat are printed to catalina..log, not only to the console. Maybe that phrase can be removed as a whole. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #5 from Sergey Vorobyev 2010-09-22 11:46:36 EDT --- Also, there are problem with 64 bit variable currentDateGenerated http://java.sun.com/docs/books/jls/third_edition/html/memory.html quote: For the purposes of the Java programming language memory model, a single write to a non-volatile long or double value is treated as two separate writes: one to each 32-bit half. This can result in a situation where a thread sees the first 32 bits of a 64 bit value from one write, and the second 32 bits from another write. Writes and reads of volatile long and double values are always atomic. Writes to and reads of references are always atomic, regardless of whether they are implemented as 32 or 64 bit values. So in first (lock-free) check if ((now - currentDateGenerated) > 1000) We can read inconsistante state -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #6 from Chuck Caldarale 2010-09-22 12:53:46 EDT --- (In reply to comment #4) > > The simple fix is to just reverse these two lines: > I afraid, it won't work. > The compiler is free to reverse these lines back. Not in this case, due to the possibility of the new operator throwing an exception and the constraint specified in section 11.3.1: "Exceptions are precise: when the transfer of control takes place, all effects of the statements executed and expressions evaluated before the point from which the exception is thrown must appear to have taken place. No expressions, statements, or parts thereof that occur after the point from which the exception is thrown may appear to have been evaluated." If there were no possibility of an exception, your statement would be true. > > the Java language spec requires operations to be > > visible to other threads in program order > Does it? That's my interpretation of this statement in section 17.4: "Each time the evaluation of thread t generates an inter-thread action, it must match the inter-thread action a of t that comes next in program order." All reads and writes of shared variables are inter-thread actions. - Chuck -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 --- Comment #7 from Chuck Caldarale 2010-09-22 12:58:53 EDT --- (In reply to comment #5) > Also, there are problem with 64 bit variable currentDateGenerated This is a problem (albeit a fairly minor one); technically, the field should be marked volatile to insure all 64 bits are read and written together. Not sure what that does to code generation on a 32-bit machine, but I suspect it's not pretty. Another reason we should all be running 64-bit boxes... - Chuck -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49978] New: WebappLoader throws exception if workDir already exists (when unpackWARs=false)
https://issues.apache.org/bugzilla/show_bug.cgi?id=49978 Summary: WebappLoader throws exception if workDir already exists (when unpackWARs=false) Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: jfrede...@dmotorworks.com In WebappLoader.setRepositories(), if the war is not unpacked, it tries to create a directory /WEB-INF/classes inside the workDir. If that directory already exists, an error is thrown and the webapp does not start. This is a change from 5.5, which didn't check the return value of classRepository.mkdirs(). mkdirs() returns false if the directories already exist. I doubt it was the intention here. Probably the intention was to throw an exception if the directory could not be created, rather than if it already existed. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49979] New: SimpleDateFormat StringIndexOutOfBoundsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=49979 Summary: SimpleDateFormat StringIndexOutOfBoundsException Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: sosig...@gmail.com thread dump here: - http-808...@2990 daemon, prio=5, in group 'main', status: 'runnable' java.lang.Thread.State: RUNNABLE at java.lang.String.charAt(String.java:686) at java.text.SimpleDateFormat.subParse(SimpleDateFormat.java:1778) at java.text.SimpleDateFormat.parse(SimpleDateFormat.java:1312) at java.text.DateFormat.parse(DateFormat.java:335) at org.apache.tomcat.util.http.FastHttpDateFormat.internalParseDate(FastHttpDateFormat.java:191) at org.apache.tomcat.util.http.FastHttpDateFormat.parseDate(FastHttpDateFormat.java:166) at org.apache.catalina.connector.Request.getDateHeader(Request.java:1837) at org.apache.catalina.connector.RequestFacade.getDateHeader(RequestFacade.java:632) at org.apache.catalina.servlets.DefaultServlet.checkIfModifiedSince(DefaultServlet.java:1604) at org.apache.catalina.servlets.DefaultServlet.checkIfHeaders(DefaultServlet.java:615) at org.apache.catalina.servlets.DefaultServlet.serveResource(DefaultServlet.java:723) at org.apache.catalina.servlets.DefaultServlet.doGet(DefaultServlet.java:332) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454) at java.lang.Thread.run(Thread.java:619) The date variable it attempts to parse above is: "Wed, 21 Apr 2010 21:20:26 GMT" OS: CentOS5 Tomcat ver.: 6.0.20 requests are coming from Windows XP/IE6 SP3 the same can be reproduced with requests from Vista/Firefox 3.6.9. Will add other environments/details as I test this on various Windows stations/locale as cannot reproduce in linux. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1000164 - /tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
Author: markt
Date: Wed Sep 22 20:04:32 2010
New Revision: 1000164
URL: http://svn.apache.org/viewvc?rev=1000164&view=rev
Log:
Add the missing onStartAsync event
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java?rev=1000164&r1=1000163&r2=1000164&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java Wed
Sep 22 20:04:32 2010
@@ -30,19 +30,23 @@ public class AsyncListenerWrapper {
private AsyncListener listener = null;
+
+public void fireOnStartAsync(AsyncEvent event) throws IOException {
+listener.onStartAsync(event);
+}
+
+
public void fireOnComplete(AsyncEvent event) throws IOException {
-// TODO SERVLET3 - async
listener.onComplete(event);
}
public void fireOnTimeout(AsyncEvent event) throws IOException {
-// TODO SERVLET3 - async
listener.onTimeout(event);
}
+
public void fireOnError(AsyncEvent event) throws IOException {
-// TODO SERVLET3 - async
listener.onError(event);
}
@@ -51,6 +55,7 @@ public class AsyncListenerWrapper {
return listener;
}
+
public void setListener(AsyncListener listener) {
this.listener = listener;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1000269 - in /tomcat/trunk: java/org/apache/catalina/startup/ test/org/apache/catalina/connector/ test/org/apache/catalina/core/ test/org/apache/catalina/filters/ test/org/apache/catalina
Author: markt
Date: Wed Sep 22 22:59:55 2010
New Revision: 1000269
URL: http://svn.apache.org/viewvc?rev=1000269&view=rev
Log:
Correctly define the ROOT context in unit tests
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed Sep 22
22:59:55 2010
@@ -193,7 +193,7 @@ public class Tomcat {
*
* TODO: add the rest
*
- * @param contextPath "/" for root context.
+ * @param contextPath "" for root context.
* @param baseDir base dir for the context, for static files. Must exist,
* relative to the server home
*/
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java Wed
Sep 22 22:59:55 2010
@@ -77,7 +77,7 @@ public class TestCoyoteAdapter extends T
fail("Unable to create foo directory in docBase");
}
-Context ctx = tomcat.addContext("/", docBase.getAbsolutePath());
+Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
ctx.addServletMapping("/", "servlet");
@@ -99,7 +99,7 @@ public class TestCoyoteAdapter extends T
// Must have a real docBase - just use temp
Context ctx =
-tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
ctx.addServletMapping("/", "servlet");
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Wed Sep 22
22:59:55 2010
@@ -211,7 +211,7 @@ public class TestRequest extends TomcatB
// Must have a real docBase - just use temp
Context ctx =
-tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// Add the Servlet
Tomcat.addServlet(ctx, "servlet", new EchoQueryStringServlet());
@@ -255,7 +255,7 @@ public class TestRequest extends TomcatB
// Must have a real docBase - just use temp
Context ctx =
-tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
LoginConfig config = new LoginConfig();
config.setAuthMethod("BASIC");
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestResponse.jav
svn commit: r1000283 - /tomcat/trunk/build.xml
Author: markt Date: Thu Sep 23 00:19:20 2010 New Revision: 1000283 URL: http://svn.apache.org/viewvc?rev=1000283&view=rev Log: Parameterize the APR location for the unit tests Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1000283&r1=1000282&r2=1000283&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu Sep 23 00:19:20 2010 @@ -74,6 +74,7 @@ + @@ -970,7 +971,7 @@ - + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1000284 - in /tomcat/trunk/java/org/apache: catalina/mbeans/ContainerMBean.java catalina/mbeans/ContextMBean.java tomcat/util/bcel/classfile/AnnotationEntry.java
Author: markt
Date: Thu Sep 23 00:30:53 2010
New Revision: 1000284
URL: http://svn.apache.org/viewvc?rev=1000284&view=rev
Log:
Fix Javadoc warnings highlighted by buildbot
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1000284&r1=1000283&r2=1000284&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Thu Sep 23
00:30:53 2010
@@ -172,7 +172,7 @@ public class ContainerMBean extends Base
/**
* Remove an existing Valve.
*
- * @param name MBean Name of the component to remove
+ * @param valveName MBean Name of the Valve to remove
*
* @exception MBeanException if a component cannot be removed
*/
@@ -242,7 +242,7 @@ public class ContainerMBean extends Base
/**
* Remove a LifecycleEvent listeners from this component.
*
- * @param listener The ClassName of the listeners to be removed.
+ * @param type The ClassName of the listeners to be removed.
* Note that all the listeners having given ClassName will be removed.
*/
public void removeLifeCycleListeners(String type) throws MBeanException{
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java?rev=1000284&r1=1000283&r2=1000284&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java Thu Sep 23
00:30:53 2010
@@ -166,7 +166,7 @@ public class ContextMBean extends Contai
* Return the filter definition for the specified filter name, if any;
* otherwise return null.
*
- * @param filterName Filter name to look up
+ * @param name Filter name to look up
*/
public String findFilterDef(String name) throws MBeanException {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1000284&r1=1000283&r2=1000284&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Thu Sep 23 00:30:53 2010
@@ -47,7 +47,6 @@ public class AnnotationEntry implements
*
* @param file
* @param constant_pool
- * @param isRuntimeVisible
* @throws IOException
*/
public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool) throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: NamingContext Possible Bug
Hello,
I want to bring this question again.
Why do we change NamingEntry type from REFERENCE to ENTRY? I think that each
lookup must return a new instance. But in this case, it returns the same bound
object instance.
Let's says that we have a Servlet
MyServlet{
private @Resource(name="MyResource") myResource;
...
public blabla(){
new InitialContext().lookup("myResource");
}
}
myResource has injected by the container before @PostConstruct is called. After
that I would like to get a new resource object in blabla() method. It returns
the same injected resource instance instead of creating a new resource.
I think that it must return a different instance from "myResource". JNDI tree
of
the Servlet contains "MyResource/ResourceRef" binding. Therefore each lookup to
"MyResource" must return a "ResourceRef". Becuase it is a reference, context
must call NamingManager.getObjectInstance again to create a new instance.
If this is a bug, I will open an issue.
Thanks;
--Gurkan
- Original Message
From: Gurkan Erdogdu
To: dev@tomcat.apache.org
Sent: Tue, September 21, 2010 6:30:43 PM
Subject: NamingContext Possible Bug
Hello folks,
In NamingContext implementation, if "lookup()" is a Reference, current
implementation caches the result of the NamingManager # getObjectInstance via
following statements and changes the type of the entry. In the following
lookups, same object is returned. I would like to write ObjectFactory that
returns new instance for each time lookup is called on its reference. But with
the current implementation, it is not possible to write such an object factory
because of aferomentioned sitaution. I think that entry must be stay as
Reference instead of changing entry type.
WDYT?
NamingContext class:
protected Object lookup(Name name, boolean resolveLinks)
throws NamingException {
.
} else if (entry.type == NamingEntry.REFERENCE) {
try {
Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
if (obj != null) {
entry.value = obj;
entry.type = NamingEntry.ENTRY; ---> CHANGES type of
the naming entry
}
return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
log.warn(sm.getString
("namingContext.failResolvingReference"), e);
throw new NamingException(e.getMessage());
}
}
...
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: NamingContext Possible Bug
For reference, the EE 6 platform spec explains that usually a new instance
should be returned on each lookup in section 5.2.4 page 67 "Sharing of
Environment Entries". The servlet 3.0 spec section 15.2.2 page 174 indicates
that this applies to servlet containers that are part of an EE
technology-compliant implementation. I guess this means that unless tomcat
implements web profile they don't have to support this? It still seems like a
good idea to me.
thanks
david jencks
On Sep 22, 2010, at 10:36 PM, Gurkan Erdogdu wrote:
> Hello,
>
> I want to bring this question again.
>
> Why do we change NamingEntry type from REFERENCE to ENTRY? I think that each
> lookup must return a new instance. But in this case, it returns the same
> bound
> object instance.
>
> Let's says that we have a Servlet
>
> MyServlet{
>
>
> private @Resource(name="MyResource") myResource;
> ...
>
> public blabla(){
> new InitialContext().lookup("myResource");
> }
> }
>
> myResource has injected by the container before @PostConstruct is called.
> After
> that I would like to get a new resource object in blabla() method. It returns
> the same injected resource instance instead of creating a new resource.
>
> I think that it must return a different instance from "myResource". JNDI tree
> of
> the Servlet contains "MyResource/ResourceRef" binding. Therefore each lookup
> to
> "MyResource" must return a "ResourceRef". Becuase it is a reference, context
> must call NamingManager.getObjectInstance again to create a new instance.
>
> If this is a bug, I will open an issue.
>
> Thanks;
>
> --Gurkan
>
>
> - Original Message
> From: Gurkan Erdogdu
> To: dev@tomcat.apache.org
> Sent: Tue, September 21, 2010 6:30:43 PM
> Subject: NamingContext Possible Bug
>
> Hello folks,
>
> In NamingContext implementation, if "lookup()" is a Reference, current
> implementation caches the result of the NamingManager # getObjectInstance via
> following statements and changes the type of the entry. In the following
> lookups, same object is returned. I would like to write ObjectFactory that
> returns new instance for each time lookup is called on its reference. But
> with
> the current implementation, it is not possible to write such an object
> factory
> because of aferomentioned sitaution. I think that entry must be stay as
> Reference instead of changing entry type.
>
> WDYT?
>
> NamingContext class:
>
> protected Object lookup(Name name, boolean resolveLinks)
>throws NamingException {
> .
>} else if (entry.type == NamingEntry.REFERENCE) {
>try {
>Object obj = NamingManager.getObjectInstance
>(entry.value, name, this, env);
>if (obj != null) {
>entry.value = obj;
>entry.type = NamingEntry.ENTRY; ---> CHANGES type of
> the naming entry
>}
>return obj;
>} catch (NamingException e) {
>throw e;
>} catch (Exception e) {
>log.warn(sm.getString
> ("namingContext.failResolvingReference"), e);
>throw new NamingException(e.getMessage());
>}
>}
>
> ...
> }
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
