svn commit: r1505627 - /tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Author: kfujino Date: Mon Jul 22 08:42:33 2013 New Revision: 1505627 URL: http://svn.apache.org/r1505627 Log: Avoid ConcurrentModificationException when sending a heartbeat. Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1505627&r1=1505626&r2=1505627&view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon Jul 22 08:42:33 2013 @@ -18,8 +18,9 @@ package org.apache.catalina.tribes.group import java.io.Serializable; -import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.catalina.tribes.ByteMessage; import org.apache.catalina.tribes.Channel; @@ -92,12 +93,12 @@ public class GroupChannel extends Channe /** * A list of membership listeners that subscribe to membership announcements */ -protected final ArrayList membershipListeners = new ArrayList<>(); +protected final List membershipListeners = new CopyOnWriteArrayList<>(); /** * A list of channel listeners that subscribe to incoming messages */ -protected final ArrayList channelListeners = new ArrayList<>(); +protected final List channelListeners = new CopyOnWriteArrayList<>(); /** * If set to true, the GroupChannel will check to make sure that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505628 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/GroupChannel.java webapps/docs/changelog.xml
Author: kfujino Date: Mon Jul 22 08:51:27 2013 New Revision: 1505628 URL: http://svn.apache.org/r1505628 Log: Avoid ConcurrentModificationException when sending a heartbeat. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1505628&r1=1505627&r2=1505628&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon Jul 22 08:51:27 2013 @@ -18,8 +18,9 @@ package org.apache.catalina.tribes.group import java.io.Serializable; -import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.catalina.tribes.ByteMessage; import org.apache.catalina.tribes.Channel; @@ -92,12 +93,12 @@ public class GroupChannel extends Channe /** * A list of membership listeners that subscribe to membership announcements */ -protected ArrayList membershipListeners = new ArrayList(); +protected List membershipListeners = new CopyOnWriteArrayList(); /** * A list of channel listeners that subscribe to incoming messages */ -protected ArrayList channelListeners = new ArrayList(); +protected List channelListeners = new CopyOnWriteArrayList(); /** * If set to true, the GroupChannel will check to make sure that Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1505628&r1=1505627&r2=1505628&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 22 08:51:27 2013 @@ -158,6 +158,10 @@ It will try to join the map membership in the heartbeat. Default value is false. (kfujino) + +Avoid ConcurrentModificationException when sending a heartbeat. +(kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505637 - /tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Author: kfujino
Date: Mon Jul 22 09:22:01 2013
New Revision: 1505637
URL: http://svn.apache.org/r1505637
Log:
Avoid NPE. If the channel fails to start, localMember is null.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1505637&r1=1505636&r2=1505637&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Jul
22 09:22:01 2013
@@ -875,6 +875,7 @@ public class SimpleTcpCluster extends Li
}
private void unregisterMember(Member member) {
+if (member == null) return;
ObjectName oname = memberOnameMap.remove(member);
if (oname != null) {
unregister(oname);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505638 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java webapps/docs/changelog.xml
Author: kfujino
Date: Mon Jul 22 09:28:04 2013
New Revision: 1505638
URL: http://svn.apache.org/r1505638
Log:
Avoid NPE. If the channel fails to start, localMember is null.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1505638&r1=1505637&r2=1505638&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Mon Jul 22 09:28:04 2013
@@ -1032,6 +1032,7 @@ public class SimpleTcpCluster extends Li
}
private void unregisterMember(Member member) {
+if (member == null) return;
ObjectName oname = memberOnameMap.remove(member);
if (oname != null) {
unregister(oname);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1505638&r1=1505637&r2=1505638&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 22 09:28:04 2013
@@ -162,6 +162,9 @@
Avoid ConcurrentModificationException when sending a heartbeat.
(kfujino)
+
+Avoid NPE when the channel fails to start. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505642 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Author: markt
Date: Mon Jul 22 09:48:53 2013
New Revision: 1505642
URL: http://svn.apache.org/r1505642
Log:
Method name changed
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1505642&r1=1505641&r2=1505642&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Mon Jul 22 09:48:53 2013
@@ -22,7 +22,7 @@ upgrade.sis.readListener.null=It is ille
upgrade.sis.read.ise=It is illegal to call any of the read() methods in
non-blocking mode without first checking that there is data available by
calling isReady()
upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the
ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must
be called first)
upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
-upgrade.sis.write.ise=It is illegal to call any of the write() methods in
non-blocking mode without first checking that there is space available by
calling canWrite()
+upgrade.sis.write.ise=It is illegal to call any of the write() methods in
non-blocking mode without first checking that there is space available by
calling isReady()
apr.read.error=Unexpected error [{0}] reading data from the APR/native socket.
apr.write.error=Unexpected error [{0}] writing data to the APR/native socket.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8.0-SNAPSHOT updated
2013/7/18 Mark Thomas wrote: > > I think we are at the point where we could do a 8.0.0-alpha release. The > specs (Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.0) are all implemented. > There is still work to do to review the EG disucssions that covered > various edge cases / things not in the spec to align the implementation > with what the EG agreed was best practice but didn't make it into the spec. > > Any objections to starting the 8.0.0 release process? > +1
[jira] [Commented] (MTOMCAT-178) additionalClasspathDirs doesn't seem to be used
[
https://issues.apache.org/jira/browse/MTOMCAT-178?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13715182#comment-13715182
]
Andrii Rubtsov commented on MTOMCAT-178:
Any update on this, guys? As far far as I can see, it does not indeed seem to
be used.
> additionalClasspathDirs doesn't seem to be used
> ---
>
> Key: MTOMCAT-178
> URL: https://issues.apache.org/jira/browse/MTOMCAT-178
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Maven 3.0.3 / Linux / OpenJDK 7
>Reporter: Craig
>Assignee: Olivier Lamy (*$^¨%`£)
>
> Using the plugin like this:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0
>
>
>
> ${project.build.directory}/../../../mits-common-parent/common-ui/src/main/resource$
>
> ${project.build.directory}/../src/main/webapp
>
>
>
> I run Tomcat like this:
> mvn tomcat7:run
> The application starts and runs fine. But, when the classloader loads a
> resource that is in one of the additionalClasspathDir entries, it loads it
> from the .war, not from the additionalClasspathDir location. Nothing I do
> seems to make Tomcat use the additionalClasspathDir entries.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55291] New: Bug in WsServerContainer leading to NPE
https://issues.apache.org/bugzilla/show_bug.cgi?id=55291 Bug ID: 55291 Summary: Bug in WsServerContainer leading to NPE Product: Tomcat 8 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: rstoyanc...@yahoo.com Created attachment 30612 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30612&action=edit Patch showing fix The registerAuthenticatedSession method appears to have a bug. It looks like it's trying to find Set or create it if it is null. But the null check is against the input argument (wsSession) not against set of WsSession's. See attached patch. -- 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: r1505689 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: violetagg
Date: Mon Jul 22 14:26:57 2013
New Revision: 1505689
URL: http://svn.apache.org/r1505689
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55291
Avoid NPE when registering a session. Patch provided by rstoyanchev.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1505689&r1=1505688&r2=1505689&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Jul 22 14:26:57 2013
@@ -347,7 +347,7 @@ public class WsServerContainer extends W
private void registerAuthenticatedSession(WsSession wsSession,
String httpSessionId) {
Set wsSessions = authenticatedSessions.get(httpSessionId);
-if (wsSession == null) {
+if (wsSessions == null) {
wsSessions = Collections.newSetFromMap(
new ConcurrentHashMap());
authenticatedSessions.putIfAbsent(httpSessionId, wsSessions);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55291] Bug in WsServerContainer leading to NPE
https://issues.apache.org/bugzilla/show_bug.cgi?id=55291 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Violeta Georgieva --- Thanks for the report and the patch. Fix is applied in trunk. -- 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
[Bug 55291] Bug in WsServerContainer leading to NPE
https://issues.apache.org/bugzilla/show_bug.cgi?id=55291 Violeta Georgieva changed: What|Removed |Added Attachment #30612|0 |1 is patch|| -- 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: Jasper improvements - web resources and TLDs
On 21/07/2013 18:36, Jeremy Boynes wrote: > With r1505235 JspC is now merging in from web fragments. > It is still not handling resources found in those jars e.g. if they > are referenced by an include directive or from a prelude/coda > configuration. It also needs to compile any JSPs found as they could be accessed directly. > This should be handled through the ServletContext so > I'd suggest approaching it using the new webresource support. > However, that has dependencies on Catalina (e.g. Lifecycle) that JspC > would not need - how hard would that be to decouple? There is a lot of code there that JspC just doesn't need. I wonder if, at this stage, it would be simpler to just check each JAR for static resources and process any JSPs found. That balance might change once overlays are introduced but even then I suspect it won't. > In the meantime, I'm going to look at refactoring the TLD support as > described above. Nice. See my note about TLD processing in the TOMCAT-NEXT.txt file in the root on trunk. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55267] NIO thread locked
https://issues.apache.org/bugzilla/show_bug.cgi?id=55267 --- Comment #3 from Mark Thomas --- Thanks for the thread dump. I'm going to assume that other information provided elsewhere is unchanged. i.e. the thread is not stuck but configured to use an excessively long timeout of 30 minutes. I have not been able to recreate this issue - even with a debugger - but I think I have got close enough to figure out what is going on and I believe I have a solution. I believe the following is happening: - Atmosphere is setting a 30 minute timeout for Comet connections - That timeout is used to set the socket read/write timeout - When the client disconnects Atmosphere closes the comet event - That triggers a write to the socket and at this point the timeout is still 30 mins - Something about the exact timing and state means that an exception is not thrown One could argue several root causes: 1 Tomcat should only apply the Comet timeout to reads, not writes 2 Atomsphere should reset the timeout once an error occurs 3 Tomcat should reset the timeout once an error occurs 4 Tomcat should reset the timeout as soon as close is called on the comet event We might be able to do something about 1 but 3 and/or 4 look like simpler solutions. Looking at implementing a solution is next on my TODO list. -- 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
Can anyone provide history for something in JspC?
This snippet from initClassLoader()
> // What is this ??
> urls.add(new File(
> clctxt.getRealPath("/")).getCanonicalFile().toURI().toURL());
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?view=markup#l1505
It's in the original import into SVN and I don't know where CVS is any more. It
seems to be adding the root of the web application into JspC's webapp
ClassLoader but I don't think why it would do that as that should not be on the
classpath.
I would like to remove this to remove any dependency on the
JspCompilationContext so I can refactor initialization of the ClassLoader into
JspCServletContext and create the ClassLoader once per run rather than create a
new one for each file.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Can anyone provide history for something in JspC?
On 22/07/2013 19:09, Jeremy Boynes wrote:
> This snippet from initClassLoader()
>> // What is this ??
>> urls.add(new File(
>> clctxt.getRealPath("/")).getCanonicalFile().toURI().toURL());
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?view=markup#l1505
>
> It's in the original import into SVN and I don't know where CVS is any more.
Everything from cvs is in svn.
You need to go back to 4.1.x as that is where the current sources were
copied from:
http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/jasper/src/share/org/apache/jasper/JspC.java?view=log
You might need to go even further back:
http://svn.apache.org/viewvc/tomcat/archive/jasper/
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505843 - /tomcat/trunk/bin/daemon.sh
Author: schultz Date: Mon Jul 22 23:19:49 2013 New Revision: 1505843 URL: http://svn.apache.org/r1505843 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268 - Replace uses of "test -z" with "test ".$FOO" = ." for better shell compatibility Modified: tomcat/trunk/bin/daemon.sh Modified: tomcat/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1505843&r1=1505842&r2=1505843&view=diff == --- tomcat/trunk/bin/daemon.sh (original) +++ tomcat/trunk/bin/daemon.sh Mon Jul 22 23:19:49 2013 @@ -108,7 +108,7 @@ test ".$CATALINA_BASE" = . && CATALINA_B test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc" # Set the default service-start wait time if necessary -test -z "$SERVICE_START_WAIT_TIME" && SERVICE_START_WAIT_TIME=10 +test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 # Ensure that any user defined CLASSPATH variables are not used on startup, # but allow them to be specified in setenv.sh, in rare case when it is needed. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505844 - in /tomcat/tc7.0.x/trunk: ./ bin/daemon.sh
Author: schultz Date: Mon Jul 22 23:21:17 2013 New Revision: 1505844 URL: http://svn.apache.org/r1505844 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268 - Replaced uses of "test -z" with "test "$FOO" = ." for better shell compatibility. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/daemon.sh Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1505843 Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1505844&r1=1505843&r2=1505844&view=diff == --- tomcat/tc7.0.x/trunk/bin/daemon.sh (original) +++ tomcat/tc7.0.x/trunk/bin/daemon.sh Mon Jul 22 23:21:17 2013 @@ -108,7 +108,7 @@ test ".$CATALINA_BASE" = . && CATALINA_B test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc" # Set the default service-start wait time if necessary -test -z "$SERVICE_START_WAIT_TIME" && SERVICE_START_WAIT_TIME=10 +test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 # Ensure that any user defined CLASSPATH variables are not used on startup, # but allow them to be specified in setenv.sh, in rare case when it is needed. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505845 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Mon Jul 22 23:26:07 2013 New Revision: 1505845 URL: http://svn.apache.org/r1505845 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=1505845&r1=1505844&r2=1505845&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 22 23:26:07 2013 @@ -72,7 +72,7 @@ PATCHES PROPOSED TO BACKPORT: Make JULI's LogManager to additionally look for logging properties without prefixes if the property cannot be found with a prefix. https://issues.apache.org/bugzilla/attachment.cgi?id=30387 - +1: kkolinko + +1: kkolinko, schultz -1: * Update Maven Central location used to download dependencies at build time @@ -80,7 +80,7 @@ PATCHES PROPOSED TO BACKPORT: (This was suggested by Olivier Lamy in Re:r1307146, http://markmail.org/message/6q2yfkqvic7bcpib ) http://svn.apache.org/r1491485 - +1: kkolinko + +1: kkolinko, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55198 @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55228 Allow applications to set an HTTP date header http://svn.apache.org/r1502258 - +1: markt + +1: markt, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268 @@ -105,7 +105,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55266 https://issues.apache.org/bugzilla/attachment.cgi?id=30608&action=diff Parse session ID before redirect as session ID may need to be encoded - +1: markt + +1: markt, schultz -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505846 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Mon Jul 22 23:28:07 2013 New Revision: 1505846 URL: http://svn.apache.org/r1505846 Log: Updated proposal 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=1505846&r1=1505845&r2=1505846&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 22 23:28:07 2013 @@ -99,6 +99,8 @@ PATCHES PROPOSED TO BACKPORT: Back-port of r1503852 from Tomcat 7.0.x. Add optional --service-start-wait-time command-line option to bin/daemon.sh to change service start wait time from default of 10 seconds. + http://svn.apache.org/r1503852 + http://svn.apache.org/r1505844 +1: schultz -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Various shell-scripting idioms in bin/daemon.sh
Mladen, On 7/17/13 7:59 AM, Mladen Turk wrote: > On 07/16/2013 11:42 PM, Christopher Schultz wrote: >> All, >> >> While doing the trivial fix for >> https://issues.apache.org/bugzilla/show_bug.cgi?id=55268, I noticed a >> few idioms being used in bin/daemon.sh that struck me as odd. For >> example: >> >> while [ ".$1" != . ] >> do >>case "$1" in >> --java-home ) >> JAVA_HOME="$2" >> shift; shift; >> continue >> ;; >> >> >> This example actually illustrates the two main questions I had: >> >> 1. Why use [ ".$FOO" != . ] instead of simply [ -n "$FOO" ] (Corollary: >> why use [ ".$FOO" = . ] instead of [ -z "$FOO" ])? >> > > Because some shell scripts does dot handle -z or -n well. Fixed in bin/daemon.sh. Thanks for the insight, -chris signature.asc Description: OpenPGP digital signature
Re: Can anyone provide history for something in JspC?
On Jul 22, 2013, at 11:22 AM, Mark Thomas wrote:
> On 22/07/2013 19:09, Jeremy Boynes wrote:
>> This snippet from initClassLoader()
>>>// What is this ??
>>>urls.add(new File(
>>>clctxt.getRealPath("/")).getCanonicalFile().toURI().toURL());
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?view=markup#l1505
>>
>> It's in the original import into SVN and I don't know where CVS is any more.
>
> Everything from cvs is in svn.
>
> You need to go back to 4.1.x as that is where the current sources were
> copied from:
>
> http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/jasper/src/share/org/apache/jasper/JspC.java?view=log
>
> You might need to go even further back:
> http://svn.apache.org/viewvc/tomcat/archive/jasper/
Best I've found is that this was added in the import of jasper2:
http://svn.apache.org/viewvc/tomcat/jasper/trunk/jasper2/src/share/org/apache/jasper/JspC.java?revision=304852&view=markup&pathrev=304852#l399
and that it was not in the original jasper:
http://svn.apache.org/viewvc/tomcat/jasper/trunk/jasper34/liaison/org/apache/jasper34/cli/CommandLineContext.java?revision=304832&view=markup&pathrev=304832#190
I think the change was made externally in cleanup prior to the import of
jasper2.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1505886 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: kfujino
Date: Tue Jul 23 02:58:42 2013
New Revision: 1505886
URL: http://svn.apache.org/r1505886
Log:
Update last modified time in redeploy resource to avoid infinite reload of
webapplication.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1505886&r1=1505885&r2=1505886&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jul 23
02:58:42 2013
@@ -1301,6 +1301,10 @@ public class HostConfig
context.setDocBase(resource.getAbsolutePath());
}
reload(app);
+// Update times
+app.redeployResources.put(resources[i],
+Long.valueOf(resource.lastModified()));
+app.timestamp = System.currentTimeMillis();
return;
} else {
// Everything else triggers a redeploy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
