svn commit: r1175155 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: rjung
Date: Sat Sep 24 11:02:41 2011
New Revision: 1175155
URL: http://svn.apache.org/viewvc?rev=1175155&view=rev
Log:
Use setters when cloning attributes.
Should be more safe in most cases.
Example: setting name directly was wrong,
because name in base class was something else
then in the sub classes.
Not using the setter for maxActiveSessions,
because it will also call property change
listeners.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1175155&r1=1175154&r2=1175155&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Sat Sep 24 11:02:41 2011
@@ -181,10 +181,10 @@ public abstract class ClusterManagerBase
}
protected void clone(ClusterManagerBase copy) {
-copy.name = "Clone-from-" + getName();
-copy.cluster = getCluster();
+copy.setName("Clone-from-" + getName());
+copy.setCluster(getCluster());
copy.maxActiveSessions = getMaxActiveSessions();
-copy.notifyListenersOnReplication = isNotifyListenersOnReplication();
+copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication());
copy.setSessionAttributeFilter(getSessionAttributeFilter());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175158 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: rjung
Date: Sat Sep 24 11:13:01 2011
New Revision: 1175158
URL: http://svn.apache.org/viewvc?rev=1175158&view=rev
Log:
Add Override annotation to recently added methods.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1175158&r1=1175157&r2=1175158&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sat Sep
24 11:13:01 2011
@@ -566,6 +566,7 @@ public class DeltaSession extends Standa
* @param value The value of the attribute to check
* @return true if the attribute is distributable, false otherwise
*/
+@Override
protected boolean isAttributeDistributable(String name, Object value) {
if (manager instanceof ClusterManagerBase &&
!((ClusterManagerBase)manager).willAttributeDistribute(name))
@@ -578,6 +579,7 @@ public class DeltaSession extends Standa
* @param name the attribute's name
* @return true is attribute should not be replicated
*/
+@Override
protected boolean exclude(String name) {
if (super.exclude(name))
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175159 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/ha/session/DeltaSession.java
Author: rjung
Date: Sat Sep 24 11:16:50 2011
New Revision: 1175159
URL: http://svn.apache.org/viewvc?rev=1175159&view=rev
Log:
1) Use setters when cloning attributes.
Should be more safe in most cases.
Example: setting name directly was wrong,
because name in base class was something else
then in the sub classes.
Not using the setter for maxActiveSessions,
because it will also call property change
listeners.
2) Add Override annotation to recently added
methods.
Merge of r1175155 and r1175158 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 11:16:50 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1175159&r1=1175158&r2=1175159&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Sat Sep 24 11:16:50 2011
@@ -181,10 +181,10 @@ public abstract class ClusterManagerBase
}
protected void clone(ClusterManagerBase copy) {
-copy.name = "Clone-from-" + getName();
-copy.cluster = getCluster();
+copy.setName("Clone-from-" + getName());
+copy.setCluster(getCluster());
copy.maxActiveSessions = getMaxActiveSessions();
-copy.notifyListenersOnReplication = isNotifyListenersOnReplication();
+copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication());
copy.setSessionAttributeFilter(getSessionAttributeFilter());
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1175159&r1=1175158&r2=1175159&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Sat Sep 24 11:16:50 2011
@@ -566,6 +566,7 @@ public class DeltaSession extends Standa
* @param value The value of the attribute to check
* @return true if the attribute is distributable, false oth
svn commit: r1175160 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sat Sep 24 11:28:05 2011 New Revision: 1175160 URL: http://svn.apache.org/viewvc?rev=1175160&view=rev Log: Updated patch with Override annotation, removed Konstantin's comment. Kept votes as-is. 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=1175160&r1=1175159&r2=1175160&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 24 11:28:05 2011 @@ -70,10 +70,10 @@ PATCHES PROPOSED TO BACKPORT: have a similar method that returns Thread.getName() names. * Fine grained control of session attribute replication in clusters. - Trunk revisions: 1172233, 1172234, 1172236, 1173088, 1173090, 1173461 - TC 7 revisions: 1172259, 1174181 + Trunk revisions: 1172233, 1172234, 1172236, 1173088, 1173090, 1173461, 1175155, 1175158 + TC 7 revisions: 1172259, 1174181, 1175159 TC 6 patch: - http://people.apache.org/~rjung/patches/cluster-attribute-filter-tc6-v2.patch + http://people.apache.org/~rjung/patches/cluster-attribute-filter-tc6-v3.patch Difference between TC 7 and TC 6: In TC 6 the feature will only be available for DeltaManager, since Delta and BackupManager do not have ClusterManagerBase as common base class. This was refactored in TC 7, so the feature is available for both there. @@ -81,8 +81,6 @@ PATCHES PROPOSED TO BACKPORT: in DeltaManager#cloneFromtemplate(). +1: rjung, kfujino, kkolinko -1: -kkolinko: One has to add @Override annotation to overridden methods -isAttributeDistributable(), exclude() in DeltaSession. * Replace unneeded call that iterated events queue in NioEndpoint.Poller. There is no need to call size() on a liked list to check whether it is empty, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1174181 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/BackupManager.java java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/ha/s
On 23.09.2011 23:57, Konstantin Kolinko wrote:
> Reviewing Eclipse warnings I noticed a bug in this commit.
Argh.
>> +protected void clone(ClusterManagerBase copy) {
>> +copy.name = "Clone-from-" + getName();
>
> The above assignment is wrong.
> It assigns to ManagerBase.name which is a static field.
> (Why that field exists and why it is not final is another question).
... which I'mnot going to answer ...
> The old code was assigning the value to BackupManager.name, which is
> an instance field.
OK, I used the setter instead now.
> In Eclipse the warning was:
> The static field ManagerBase.name should be accessed in a static way
>
> Also there are several missing @Override annotations in the new methods.
Fixed also, ported to TC 7, updated TC 6 patch for Override, kept your
vote in STATUS.txt.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1174181 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/BackupManager.java java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/ha/s
2011/9/24 Rainer Jung : > > Fixed also, ported to TC 7, updated TC 6 patch for Override, kept your > vote in STATUS.txt. > OK, good. Thank you. BTW, typo in JavaDoc in the patch. @return true is attribute should not be replicated @return true if attribute should not be replicated There are enough votes to apply that patch to TC6. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1174181 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/BackupManager.java java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/ha/s
On 24.09.2011 13:57, Konstantin Kolinko wrote: > 2011/9/24 Rainer Jung : >> >> Fixed also, ported to TC 7, updated TC 6 patch for Override, kept your >> vote in STATUS.txt. >> > > OK, good. Thank you. > > BTW, typo in JavaDoc in the patch. > @return true is attribute should not be replicated > @return true if attribute should not be replicated Will fix when applying. > There are enough votes to apply that patch to TC6. I know, thanks for voting, just didn't want to rush and give enough time to review. Will commit later today. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175167 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko
Date: Sat Sep 24 13:39:44 2011
New Revision: 1175167
URL: http://svn.apache.org/viewvc?rev=1175167&view=rev
Log:
Do not try to delete the whole output/test-tmp subdirectory when running tests,
because that wouldn't succeed (at least on Windows).
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175167&r1=1175166&r2=1175167&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sat Sep
24 13:39:44 2011
@@ -184,7 +184,11 @@ public abstract class TomcatBaseTest {
}
tomcat.destroy();
}
-ExpandWar.delete(tempDir);
+// Cannot delete the whole tempDir, because logs are there,
+// and they might be open for writing.
+// Delete known subdirectories of it.
+ExpandWar.delete(new File(tempDir, "webapps"));
+ExpandWar.delete(new File(tempDir, "work"));
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175168 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko
Date: Sat Sep 24 13:42:47 2011
New Revision: 1175168
URL: http://svn.apache.org/viewvc?rev=1175168&view=rev
Log:
Merged revision 1175167 from tomcat/trunk:
Do not try to delete the whole output/test-tmp subdirectory when running tests,
because that wouldn't succeed (at least on Windows).
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 13:42:47 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175168&r1=1175167&r2=1175168&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sat Sep 24 13:42:47 2011
@@ -184,7 +184,11 @@ public abstract class TomcatBaseTest {
}
tomcat.destroy();
}
-ExpandWar.delete(tempDir);
+// Cannot delete the whole tempDir, because logs are there,
+// and they might be open for writing.
+// Delete known subdirectories of it.
+ExpandWar.delete(new File(tempDir, "webapps"));
+ExpandWar.delete(new File(tempDir, "work"));
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51887] New: Speedup sessionid generation when running testsuite
https://issues.apache.org/bugzilla/show_bug.cgi?id=51887 Bug #: 51887 Summary: Speedup sessionid generation when running testsuite Product: Tomcat 7 Version: trunk Platform: PC Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: knst.koli...@gmail.com Classification: Unclassified Created attachment 27581 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27581 2011-09-24_tc8_DummySecureRandom.patch When I run the Tomcat tests on Windows, I see a lot of following messages in the logs: [junit] 24.09.2011 17:23:56 org.apache.catalina.util.SessionIdGenerator createSecureRandom [junit] INFO: Creation of SecureRandom instance for session ID generation using [SHA1PRNG] took [5,019] milliseconds. It is OK whan starting a single Tomcat instance, but when running tests it adds 5 seconds to each startup of Tomcat. I am attaching patch that 1) Adds new DummySecureRandom class. 2) Hardcodes SessionIdGenerator to use this class. The SessionIdGenerator part of the patch cannot be committed as is. -- 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 51887] Speedup sessionid generation when running testsuite
https://issues.apache.org/bugzilla/show_bug.cgi?id=51887 Konstantin Kolinko changed: What|Removed |Added Attachment #27581|0 |1 is patch|| Attachment #27581|application/octet-stream|text/plain mime type|| -- 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: r1175182 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpNioProcessor.java AjpProcessor.java
Author: rjung
Date: Sat Sep 24 15:57:03 2011
New Revision: 1175182
URL: http://svn.apache.org/viewvc?rev=1175182&view=rev
Log:
Break from AJP CPING handling if endpoint is
already paused.
Experimenting shows, that we will otherwise
loose the following request. TC will not
answer it, but mod_jk doesn't resend if properly
configured. CPING is meant to detect this.
Not 100% sure about the call to recycle(),
but didn't find where else it would happen.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175182&r1=1175181&r2=1175182&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sat Sep 24
15:57:03 2011
@@ -134,6 +134,10 @@ public class AjpAprProcessor extends Abs
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
+if (endpoint.isPaused()) {
+recycle(true);
+break;
+}
if (Socket.send(socketRef, pongMessageArray, 0,
pongMessageArray.length) < 0) {
error = true;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1175182&r1=1175181&r2=1175182&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sat Sep 24
15:57:03 2011
@@ -118,6 +118,10 @@ public class AjpNioProcessor extends Abs
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
+if (endpoint.isPaused()) {
+recycle(true);
+break;
+}
try {
output(pongMessageArray, 0, pongMessageArray.length);
} catch (IOException e) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1175182&r1=1175181&r2=1175182&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Sep 24
15:57:03 2011
@@ -136,6 +136,10 @@ public class AjpProcessor extends Abstra
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
+if (endpoint.isPaused()) {
+recycle(true);
+break;
+}
try {
output.write(pongMessageArray);
} catch (IOException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175187 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpAprProcessor.java java/org/apache/coyote/ajp/AjpNioProcessor.java java/org/apache/coyote/ajp/AjpProcessor.java
Author: rjung
Date: Sat Sep 24 16:21:29 2011
New Revision: 1175187
URL: http://svn.apache.org/viewvc?rev=1175187&view=rev
Log:
Break from AJP CPING handling if endpoint is
already paused.
Experimentation shows, that we will otherwise
loose the following request. TC will not
answer it, but mod_jk doesn't resend if properly
configured. CPING is meant to detect this.
Not 100% sure about the call to recycle(),
but didn't find where else it would happen.
Merge of r1175182 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 16:21:29 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175187&r1=1175186&r2=1175187&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sat
Sep 24 16:21:29 2011
@@ -134,6 +134,10 @@ public class AjpAprProcessor extends Abs
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
+if (endpoint.isPaused()) {
+recycle(true);
+break;
+}
if (Socket.send(socketRef, pongMessageArray, 0,
pongMessageArray.length) < 0) {
error = true;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1175187&r1=1175186&r2=1175187&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sat
Sep 24 16:21:29 2011
@@ -118,6 +118,10 @@ public class AjpNioProcessor extends Abs
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
+
svn commit: r1175190 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: rjung
Date: Sat Sep 24 16:31:27 2011
New Revision: 1175190
URL: http://svn.apache.org/viewvc?rev=1175190&view=rev
Log:
Fix Javadoc typo.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1175190&r1=1175189&r2=1175190&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sat Sep
24 16:31:27 2011
@@ -577,7 +577,7 @@ public class DeltaSession extends Standa
/**
* Exclude attributes from replication.
* @param name the attribute's name
- * @return true is attribute should not be replicated
+ * @return true if attribute should not be replicated
*/
@Override
protected boolean exclude(String name) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175194 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/DeltaSession.java
Author: rjung
Date: Sat Sep 24 16:32:19 2011
New Revision: 1175194
URL: http://svn.apache.org/viewvc?rev=1175194&view=rev
Log:
Fix Javadoc typo.
Merge of r1175190 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 16:32:19 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1175194&r1=1175193&r2=1175194&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Sat Sep 24 16:32:19 2011
@@ -577,7 +577,7 @@ public class DeltaSession extends Standa
/**
* Exclude attributes from replication.
* @param name the attribute's name
- * @return true is attribute should not be replicated
+ * @return true if attribute should not be replicated
*/
@Override
protected boolean exclude(String name) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175196 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/ webapps/docs/config/
Author: rjung Date: Sat Sep 24 16:39:29 2011 New Revision: 1175196 URL: http://svn.apache.org/viewvc?rev=1175196&view=rev Log: Fine grained control of session attribute replication in clusters. - Allow to overwrite the check for distributability of session attributes by session implementations. - New cluster manager attribute sessionAttributeFilter allows to filter which session attributes are replicated using a regular expression applied to the attribute name. Merge of r1172233-1172234,r1172236,r1175158,r1175190 from trunk respectively r1172259 and r1175194 from TC7 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/ClusterManagerBase.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 24 16:39:29 2011 @@ -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,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,10552
svn commit: r1175201 - in /tomcat/trunk/test/org/apache/catalina/startup: FastNonSecureRandom.java TomcatBaseTest.java
Author: markt
Date: Sat Sep 24 17:20:21 2011
New Revision: 1175201
URL: http://svn.apache.org/viewvc?rev=1175201&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51887
Use an insecure random source for session ID generation during tests for speed.
Based on kkolinko's suggestion.
Added:
tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
(with props)
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Added: tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java?rev=1175201&view=auto
==
--- tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java Sat
Sep 24 17:20:21 2011
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.startup;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+public class FastNonSecureRandom extends SecureRandom {
+
+private static final long serialVersionUID = 1L;
+
+private final Random random = new Random();
+
+@Override
+public String getAlgorithm() {
+return "INSECURE";
+}
+
+@Override
+public synchronized void setSeed(byte[] seed) {
+// Not implemented
+}
+
+@Override
+public synchronized void setSeed(long seed) {
+// The super class constructor calls this method earlier than our
+// fields are initialized. Ignore the call.
+if (random == null) {
+return;
+}
+random.setSeed(seed);
+}
+
+@Override
+public synchronized void nextBytes(byte[] bytes) {
+random.nextBytes(bytes);
+}
+
+@Override
+public byte[] generateSeed(int numBytes) {
+byte[] value = new byte[numBytes];
+nextBytes(value);
+return value;
+}
+
+}
\ No newline at end of file
Propchange:
tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
--
svn:eol-style = native
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175201&r1=1175200&r2=1175201&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sat Sep
24 17:20:21 2011
@@ -37,10 +37,15 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
+import org.apache.catalina.Container;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.Server;
+import org.apache.catalina.Service;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.AprLifecycleListener;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.session.StandardManager;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -126,7 +131,7 @@ public abstract class TomcatBaseTest {
fail("Unable to create appBase for test");
}
-tomcat = new Tomcat();
+tomcat = new TomcatWithFastSessionIDs();
String protocol = getProtocol();
Connector connector = new Connector(protocol);
@@ -362,4 +367,27 @@ public abstract class TomcatBaseTest {
return rc;
}
+private static class TomcatWithFastSessionIDs extends Tomcat {
+
+@Override
+public void start() throws LifecycleException {
+// Use fats, insecure session ID generation for all tests
+Server server = getServer();
+for (Service service : server.findServices()) {
+Container e = service.getContainer();
+for (Container h : e.findChildren()) {
+
svn commit: r1175202 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/FastNonSecureRandom.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
Author: markt
Date: Sat Sep 24 17:23:12 2011
New Revision: 1175202
URL: http://svn.apache.org/viewvc?rev=1175202&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51887
Use an insecure random source for session ID generation during tests for speed.
Based on kkolinko's suggestion.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
- copied unchanged from r1175201,
tomcat/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 17:23:12 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175202&r1=1175201&r2=1175202&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sat Sep 24 17:23:12 2011
@@ -37,10 +37,15 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
+import org.apache.catalina.Container;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.Server;
+import org.apache.catalina.Service;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.AprLifecycleListener;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.session.StandardManager;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -126,7 +131,7 @@ public abstract class TomcatBaseTest {
fail("Unable to create appBase for test");
}
-tomcat = new Tomcat();
+tomcat = new TomcatWithFastSessionIDs();
String protocol = getProtocol();
Connector connector = new Connector(protocol);
@@ -362,4 +367,27 @@ public abstract class TomcatBaseTest {
return rc;
}
+private static class TomcatWithFastSessionIDs extends Tomcat {
+
+@Override
+public void start() throws LifecycleException {
+// Use fats, insecure session ID generation for all tests
+Server server = getServer();
+fo
DO NOT REPLY [Bug 51887] Speedup sessionid generation when running testsuite
https://issues.apache.org/bugzilla/show_bug.cgi?id=51887 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #1 from Mark Thomas 2011-09-24 17:23:42 UTC --- Solution based on the proposed patch has been applied to trunk and 7.0.x and will be included in 7.0.22 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
svn commit: r1175238 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: rjung Date: Sat Sep 24 20:20:25 2011 New Revision: 1175238 URL: http://svn.apache.org/viewvc?rev=1175238&view=rev Log: Choose "errno" instead of "error" in logging, so that "[error]" stays reserved for error messages. Modified: tomcat/jk/trunk/native/common/jk_connect.c Modified: tomcat/jk/trunk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1175238&r1=1175237&r2=1175238&view=diff == --- tomcat/jk/trunk/native/common/jk_connect.c (original) +++ tomcat/jk/trunk/native/common/jk_connect.c Sat Sep 24 20:20:25 2011 @@ -959,7 +959,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char * return buf; } } -sprintf(buf, "error=%d", errno); +sprintf(buf, "errno=%d", errno); return buf; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175272 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko
Date: Sat Sep 24 22:13:37 2011
New Revision: 1175272
URL: http://svn.apache.org/viewvc?rev=1175272&view=rev
Log:
Correct a typo
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175272&r1=1175271&r2=1175272&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sat Sep
24 22:13:37 2011
@@ -371,7 +371,7 @@ public abstract class TomcatBaseTest {
@Override
public void start() throws LifecycleException {
-// Use fats, insecure session ID generation for all tests
+// Use fast, insecure session ID generation for all tests
Server server = getServer();
for (Service service : server.findServices()) {
Container e = service.getContainer();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175273 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko
Date: Sat Sep 24 22:15:49 2011
New Revision: 1175273
URL: http://svn.apache.org/viewvc?rev=1175273&view=rev
Log:
Merged revision 1175272 from tomcat/trunk:
Correct a typo
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 22:15:49 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175273&r1=1175272&r2=1175273&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sat Sep 24 22:15:49 2011
@@ -371,7 +371,7 @@ public abstract class TomcatBaseTest {
@Override
public void start() throws LifecycleException {
-// Use fats, insecure session ID generation for all tests
+// Use fast, insecure session ID generation for all tests
Server server = getServer();
for (Service service : server.findServices()) {
Container e = service.getContainer();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175275 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Author: kkolinko Date: Sat Sep 24 22:30:59 2011 New Revision: 1175275 URL: http://svn.apache.org/viewvc?rev=1175275&view=rev Log: Reduce visibility of static field ManagerBase.name and make it final. We already had a bug being introduced in r1174181 because of this field being assignable. Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1175275&r1=1175274&r2=1175275&view=diff == --- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Sat Sep 24 22:30:59 2011 @@ -86,6 +86,12 @@ public abstract class ManagerBase extend /** + * The descriptive name of this Manager implementation (for logging). + */ +private static final String name = "ManagerBase"; + + +/** * The default maximum inactive interval for Sessions created by * this Manager. */ @@ -99,12 +105,6 @@ public abstract class ManagerBase extend /** - * The descriptive name of this Manager implementation (for logging). - */ -protected static String name = "ManagerBase"; - - -/** * The Java class name of the secure random number generator class to be * used when generating session identifiers. The random number generator * class must be self-seeding and have a zero-argument constructor. If not - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175277 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/session/ManagerBase.java webapps/docs/changelog.xml
Author: kkolinko Date: Sat Sep 24 22:37:12 2011 New Revision: 1175277 URL: http://svn.apache.org/viewvc?rev=1175277&view=rev Log: Merged revision 1175275 from tomcat/trunk: Reduce visibility of static field ManagerBase.name and make it final. We already had a bug being introduced in r1174181 because of this field being assignable. If anyone wants to read it, there is getName() method, or just substitute the literal string value. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 24 22:37:12 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461 ,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461 ,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1175277&r1=1175276&r2=1175277&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Sat Sep 24 22:37:12 2011 @@ -86,6 +86,12 @@ public abstract class ManagerBase extend /** + * The descriptive name of this Manager implementation (for logging). + */ +private static final String name = "ManagerBase"; + + +/** * The default maximum inactive interval for Sessions created by * this Manager. */ @@ -99,12 +105,6 @@ public abstract class ManagerBase extend /** - * The descriptive name of this Manager implementation (for logging). - */ -protected static String name = "ManagerBase"; - - -/** * The Java class name of the secure random number generator class to be * used when generating session identifiers. The random number generator * class must be self-seeding and have a zero-argument constructor. If not 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=1175277&r1=1175276&r2=1175277&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Sep 24 22:37:12 2011 @@ -122,6 +122,10 @@ JreMemoryLeakPreventionListener to allow pre-loading of configurable classes to avoid some classloader leaks. (slaurent)
svn commit: r1175280 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Author: kkolinko
Date: Sat Sep 24 22:42:30 2011
New Revision: 1175280
URL: http://svn.apache.org/viewvc?rev=1175280&view=rev
Log:
Merged revision(s) 1174339, 1174799 from tomcat/trunk:
Fix warnings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 22:42:30 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1175280&r1=1175279&r2=1175280&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Sat Sep 24 22:42:30 2011
@@ -784,6 +784,7 @@ public abstract class AbstractHttp11Proc
InputFilter savedBody = new SavedRequestInputFilter(body);
savedBody.setRequest(request);
+@SuppressWarnings("unchecked")
AbstractInputBuffer internalBuffer = (AbstractInputBuffer)
request.getInputBuffer();
internalBuffer.addActiveFilter(savedBody);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1175280&r1=1175279&r2=1175280&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Sat Sep 24 22:42:30 2011
@@ -233,7 +233,7 @@ class JSSESupport implements SSLSupport,
break;
}
}
-keySize = new Integer(size);
+keySize = Integer.valueOf(size);
synchronized(keySizeCache) {
keySizeCache.put(session, keySize);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175283 - in /tomcat/trunk/test/org/apache/catalina: connector/TestCoyoteAdapter.java core/TestAsyncContextImpl.java mbeans/TestRegistration.java servlets/TestDefaultServlet.java startup/
Author: kkolinko
Date: Sat Sep 24 23:31:04 2011
New Revision: 1175283
URL: http://svn.apache.org/viewvc?rev=1175283&view=rev
Log:
Cleanup temporary files created by tests:
register them and delete them in tearDown().
In TestRegistration also aligned mkdir calls with their usage elsewhere.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
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=1175283&r1=1175282&r2=1175283&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java Sat
Sep 24 23:31:04 2011
@@ -87,6 +87,7 @@ public class TestCoyoteAdapter extends T
// Create the folder that will trigger the redirect
File foo = new File(docBase, "foo");
+addDeleteOnTearDown(foo);
if (!foo.mkdirs() && !foo.isDirectory()) {
fail("Unable to create foo directory in docBase");
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1175283&r1=1175282&r2=1175283&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Sat
Sep 24 23:31:04 2011
@@ -411,6 +411,7 @@ public class TestAsyncContextImpl extend
// Create the folder that will trigger the redirect
File foo = new File(docBase, "async");
+addDeleteOnTearDown(foo);
if (!foo.mkdirs() && !foo.isDirectory()) {
fail("Unable to create async directory in docBase");
}
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1175283&r1=1175282&r2=1175283&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sat Sep
24 23:31:04 2011
@@ -116,9 +116,9 @@ public class TestRegistration extends To
final Tomcat tomcat = getTomcatInstance();
final File contextDir = new File(getTemporaryDirectory(), "webappFoo");
-if (!contextDir.exists()) {
-if (!contextDir.mkdir())
-fail("Failed to create: [" + contextDir.toString() + "]");
+addDeleteOnTearDown(contextDir);
+if (!contextDir.mkdirs() && !contextDir.isDirectory()) {
+fail("Failed to create: [" + contextDir.toString() + "]");
}
tomcat.addContext(contextName, contextDir.getAbsolutePath());
tomcat.start();
@@ -172,9 +172,9 @@ public class TestRegistration extends To
tomcat.getEngine().addChild(host);
final File contextDir2 = new File(getTemporaryDirectory(),
"webappFoo2");
-if (!contextDir2.exists()) {
-if (!contextDir2.mkdir())
-fail("Failed to create: [" + contextDir2.toString() + "]");
+addDeleteOnTearDown(contextDir2);
+if (!contextDir2.mkdirs() && !contextDir2.isDirectory()) {
+fail("Failed to create: [" + contextDir2.toString() + "]");
}
tomcat.addContext(host, contextName + "2",
contextDir2.getAbsolutePath());
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1175283&r1=1175282&r2=1175283&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Sat
Sep 24 23:31:04 2011
@@ -164,6 +164,7 @@ public class TestDefaultServlet extends
public void testCustomErrorPage() throws Exception {
File appDir = new File(getTemporaryDirectory(), "MyApp");
File webInf = new File(appDir, "WEB-INF");
+addDeleteOnTearDown(appDir);
if (!webInf.mkdirs() && !webInf.isDirectory()) {
fail("Unable to create directory [" + webInf + "]");
}
svn commit: r1175284 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/ test/org/apache/catalina/core/ test/org/apache/catalina/mbeans/ test/org/apache/catalina/servlets/ test/org/apac
Author: kkolinko
Date: Sat Sep 24 23:37:21 2011
New Revision: 1175284
URL: http://svn.apache.org/viewvc?rev=1175284&view=rev
Log:
Merged revision 1175283 from tomcat/trunk:
Cleanup temporary files created by tests:
register them and delete them in tearDown().
In TestRegistration also aligned mkdir calls with their usage elsewhere.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 23:37:21 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
Sat Sep 24 23:37:21 2011
@@ -87,6 +87,7 @@ public class TestCoyoteAdapter extends T
// Create the folder that will trigger the redirect
File foo = new File(docBase, "foo");
+addDeleteOnTearDown(foo);
if (!foo.mkdirs() && !foo.isDirectory()) {
fail("Unable to create foo directory in docBase");
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Sat Sep 24 23:37:21 2011
@@ -411,6 +411,7 @@ public class TestAsyncContextImpl extend
// Create the folder that will trigger the redirect
File foo = new File(docBase, "async");
+addDeleteOnTearDown(foo);
if (!foo.mkdirs() &&
DO NOT REPLY [Bug 18500] Host aliases to match by regular expression
https://issues.apache.org/bugzilla/show_bug.cgi?id=18500 --- Comment #8 from Konstantin Kolinko 2011-09-25 00:13:23 UTC --- (In reply to comment #7) > Konstantin, in that case we would just maintain a separate list of regex-based > matchers and they would all be consulted if no exact match was found, > right? Fall-back is the same. > > Your suggestion is certainly simpler than mine, and will perform better when > there are mixed regex/non-regex declarations. Yes. That is the idea. The thread I linked in comment 6 proposes yet another matching: *.domainname That is suffix matching, like the one you can use when configuring your DNS, or when purchasing an SSL certificate for your site. -- 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
