[jira] [Closed] (MTOMCAT-96) deployment of the site in the tomcat land
[ https://issues.apache.org/jira/browse/MTOMCAT-96?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-96. --- Resolution: Fixed done > deployment of the site in the tomcat land > - > > Key: MTOMCAT-96 > URL: https://issues.apache.org/jira/browse/MTOMCAT-96 > Project: Maven 2.x Tomcat Plugin > Issue Type: Task >Reporter: Olivier Lamy >Assignee: Olivier Lamy > Fix For: 2.0 > > > The goal is to deploy the generated maven site to > http://tomcat.apache.org/maven-plugin/ . > And add a link to it in Tomcat home called Maven Plugin just below the > existing Taglibs link. > Let me know if that makes sense ? -- This message is automatically generated by JIRA. 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
[jira] [Closed] (MTOMCAT-97) rename current tomcat maven plugin to tomcat6 and add tomcat7
[ https://issues.apache.org/jira/browse/MTOMCAT-97?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-97. --- Resolution: Fixed done renamed to tomcat6 > rename current tomcat maven plugin to tomcat6 and add tomcat7 > -- > > Key: MTOMCAT-97 > URL: https://issues.apache.org/jira/browse/MTOMCAT-97 > Project: Maven 2.x Tomcat Plugin > Issue Type: Task >Reporter: Olivier Lamy >Assignee: Olivier Lamy > Fix For: 2.0 > > > To prevent confusion for users, I'd like to rename the current version which > supports tomcat 6 to tomcat6 and add tomcat 7 support in tomcat7. > users will have now to use tomcat6:run instead tomcat:run. > Btw users will have to add a pluginGroup entry in ~/.m2/settings.xml as the > used groupId is not automatically discovered by maven core. > Any objections ? -- This message is automatically generated by JIRA. 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
svn commit: r1174580 - /tomcat/jk/trunk/native/common/jk_status.c
Author: rjung
Date: Fri Sep 23 08:06:51 2011
New Revision: 1174580
URL: http://svn.apache.org/viewvc?rev=1174580&view=rev
Log:
Add "stateless" to the status worker
html template.
The values were already passed in, which crashed
the status worker.
Modified:
tomcat/jk/trunk/native/common/jk_status.c
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1174580&r1=1174579&r2=1174580&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Fri Sep 23 08:06:51 2011
@@ -232,9 +232,9 @@
#define JK_STATUS_FORM_HIDDEN_INT "\n"
#define JK_STATUS_FORM_HIDDEN_STRING "\n"
#define JK_STATUS_URI_MAP_TABLE_HEAD
"%s%s%s%s%s%s%s%s%s%s\n"
-#define JK_STATUS_URI_MAP_TABLE_ROW
"%s%s%s%d%d%s%s%s%s%d\n"
+#define JK_STATUS_URI_MAP_TABLE_ROW
"%s%s%s%d%d%d%s%s%s%s%d\n"
#define JK_STATUS_URI_MAP_TABLE_HEAD2
"%s%s%s%s%s%s%s%s%s%s%s\n"
-#define JK_STATUS_URI_MAP_TABLE_ROW2
"%s%s%s%s%d%d%s%s%s%s%d\n"
+#define JK_STATUS_URI_MAP_TABLE_ROW2
"%s%s%s%s%d%d%d%s%s%s%s%d\n"
#define JK_STATUS_SHOW_AJP_CONF_HEAD "" \
"Type" \
""
JK_STATUS_ARG_AJP_TEXT_HOST_STR "" \
@@ -1670,10 +1670,10 @@ static void display_maps(jk_ws_service_t
jk_puts(s, "]\n");
if (has_server_iterator)
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD2,
- "Server", "URI", "Match Type", "Source", "Reply
Timeout", "Sticky Ignore", "Fail on Status", "Active", "Disabled", "Stopped",
"Use Server Errors");
+ "Server", "URI", "Match Type", "Source", "Reply
Timeout", "Sticky Ignore", "Stateless", "Fail on Status", "Active", "Disabled",
"Stopped", "Use Server Errors");
else
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD,
- "URI", "Match Type", "Source", "Reply Timeout",
"Sticky Ignore", "Fail on Status", "Active", "Disabled", "Stopped", "Use Server
Errors");
+ "URI", "Match Type", "Source", "Reply Timeout",
"Sticky Ignore", "Stateless", "Fail on Status", "Active", "Disabled",
"Stopped", "Use Server Errors");
}
count = 0;
if (has_server_iterator) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request
https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
--- Comment #8 from Mark Thomas 2011-09-23 08:09:32 UTC ---
Looking at this again this morning, if the problem is in a Valve
RECYCLE_FACADES won't help since Valves have direct access to the Request
object rather than using the Facade.
The patch below can be used to see if a Valve (or similar) is accessing the
request after it has been recycled. In addition to logging an error, it can
either return null or throw an exception if this happens. Just comment out the
one you don't want.
Index: java/org/apache/catalina/connector/Request.java
===
--- java/org/apache/catalina/connector/Request.java(revision 1174344)
+++ java/org/apache/catalina/connector/Request.java(working copy)
@@ -508,7 +508,8 @@
}
mappingData.recycle();
-
+remoteAddr = null;
+
if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
if (facade != null) {
facade.clear();
@@ -1263,6 +1264,12 @@
*/
@Override
public String getRemoteAddr() {
+if (mappingData.host == null) {
+String msg = "Access to Request at invalid point in lifecycle";
+log.error(msg);
+// throw new IllegalStateException(msg);
+return null;
+}
if (remoteAddr == null) {
coyoteRequest.action
(ActionCode.REQ_HOST_ADDR_ATTRIBUTE, coyoteRequest);
--
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 51881] New: Server incorrectly parses incoming HTTP requests and loses them
https://issues.apache.org/bugzilla/show_bug.cgi?id=51881 Bug #: 51881 Summary: Server incorrectly parses incoming HTTP requests and loses them Product: Tomcat 7 Version: 7.0.21 Platform: PC Status: NEW Severity: critical Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: stfigh...@mail.ru Classification: Unclassified We are developing Comet-based web application with native Tomcat Comet support via Atmosphere framework. We use HTTP streaming for transferring data from our servlet to the client. In our scenario, the user connects to the server with XMLHTTPRequest sending GET. In response, we suspend his connection and then, when needed, send data back to him. When the user opens another browser tab and connects to our web application, our web application should close the connection in the first (previously opened) tab and then suspend and use connection from the second. So, my serlvet detect that another GET is incoming in the same session, finds previous connection and closes it (internally using CometEvent.close()). This works as intended. However, the next HTTP request to the web server is not correctly handled, and in my servlet I receive the strange HttpServletRequest with previous GET query string and duplicate request headers from initial GET and the following request. I traced through the Tomcat code, and noticed, that in org.apache.coyote.http11.Http11Processor.process() request field is usually empty (contains no HTTP method, request headers, etc.) However, after Comet closing this object is not empty and contain previoud HTTP request. Later the request headers are parsed and appended to the fields existed in previous request object. After that, this invalid object is passed to my Servlet. I suppose, that clearing request object when closing comet event and all assosiated data in Http11NioProcessor.actionInternal() can solve this issue. -- 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 51881] Server incorrectly parses incoming HTTP requests and loses them
https://issues.apache.org/bugzilla/show_bug.cgi?id=51881 --- Comment #1 from Edward Alexandrov 2011-09-23 11:57:20 UTC --- Created attachment 27576 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27576 Screenshots from my debugger -- 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 51883] New: NullPointerException in StandardContextValve.invoke
https://issues.apache.org/bugzilla/show_bug.cgi?id=51883 Bug #: 51883 Summary: NullPointerException in StandardContextValve.invoke Product: Tomcat 7 Version: 7.0.19 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: stfigh...@mail.ru Classification: Unclassified >From time to time I get NullPointerException in StandardContextValve during Comet-based application. After this the request isn't handled correctly. Here is the stack trace. This issue pops up periodically, but inconsistently, I cannot describe how to reproduce it. Here is the exception stack trace. 23.09.2011 16:48:44 org.apache.catalina.connector.CoyoteAdapter service SEVERE: An exception or error occurred in the container during the request processing java.lang.NullPointerException at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:124) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:164) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:100) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:851) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:405) at org.apache.coyote.http11.Http11NioProcessor.process(Http11NioProcessor.java:313) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:515) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1544) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:636) -- 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 51883] NullPointerException in StandardContextValve.invoke
https://issues.apache.org/bugzilla/show_bug.cgi?id=51883
Konstantin Kolinko changed:
What|Removed |Added
OS/Version||All
--- Comment #1 from Konstantin Kolinko 2011-09-23
13:30:13 UTC ---
In TOMCAT_7_0_19: (The code is the same in the current trunk)
It is inside the following method:
public final void invoke(Request request, Response response)
throws IOException, ServletException {
122 // Wait if we are reloading
123 boolean reloaded = false;
124 while (context.getPaused()) {
125 reloaded = true;
126 try {
127 Thread.sleep(1000);
128 } catch (InterruptedException e) {
129 // Ignore
130 }
131 }
The only reason that I see why context can be null on line 124 is that the
webapp has been stopped.
In that case you would not be able to process the request anyway. The NPE is
unexpected, but it saves you from infinite looping there.
--
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 51883] NullPointerException in StandardContextValve.invoke
https://issues.apache.org/bugzilla/show_bug.cgi?id=51883 --- Comment #2 from Edward Alexandrov 2011-09-23 13:37:14 UTC --- The app is definitely running -- 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: r1174799 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Author: markt
Date: Fri Sep 23 14:23:40 2011
New Revision: 1174799
URL: http://svn.apache.org/viewvc?rev=1174799&view=rev
Log:
Fix FindBugs warning
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1174799&r1=1174798&r2=1174799&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Fri Sep
23 14:23:40 2011
@@ -221,7 +221,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: r1174811 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Sep 23 14:31:54 2011 New Revision: 1174811 URL: http://svn.apache.org/viewvc?rev=1174811&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1174811&r1=1174810&r2=1174811&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 23 14:31:54 2011 @@ -79,7 +79,7 @@ PATCHES PROPOSED TO BACKPORT: base class. This was refactored in TC 7, so the feature is available for both there. So it is a straight backport of r1172259, but instead of r1174181 copy the new attribute in DeltaManager#cloneFromtemplate(). - +1: rjung, kfujino + +1: rjung, kfujino, kkolinko * 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, @@ -91,9 +91,13 @@ PATCHES PROPOSED TO BACKPORT: * bug 51862: JreMemoryLeakPreventionListener enhancement to load configurable classes https://issues.apache.org/bugzilla/show_bug.cgi?id=51862 http://svn.apache.org/viewvc?rev=1174359&view=rev - +1: slaurent + +1: slaurent, kkolinko -1: + kkolinko: In trunk it is r1174353. Maybe better to merge from there + instead of r1174359, for consistency. The code is the same in both. + + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1174468 - /tomcat/jk/trunk/native/common/jk_lb_worker.c
2011/9/23 :
> Author: rjung
> Date: Fri Sep 23 00:46:55 2011
> New Revision: 1174468
>
> URL: http://svn.apache.org/viewvc?rev=1174468&view=rev
> Log:
> When using the alternate decay for the "Next"
> session lb method, calculate curmin only for
> active workers. Otherwise curmin will quickly
> stabilize at "0".
>
> Decay non-active workers as well so that they
> do not report fantasy values.
>
> Modified:
> tomcat/jk/trunk/native/common/jk_lb_worker.c
>
> Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
> URL:
> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1174468&r1=1174467&r2=1174468&view=diff
> ==
> --- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
> +++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Sep 23 00:46:55 2011
> @@ -624,7 +624,7 @@ static jk_uint64_t decay_load(lb_worker_
> {
> unsigned int i;
> jk_uint64_t curmax = 0;
> - jk_uint64_t curmin;
> + jk_uint64_t curmin = 0;
> lb_sub_worker_t *w;
> ajp_worker_t *aw;
>
> @@ -636,9 +636,6 @@ static jk_uint64_t decay_load(lb_worker_
> if (p->lbmethod != JK_LB_METHOD_NEXT) {
> w->s->lb_value >>= exponent;
> }
> - if (w->s->lb_value < curmin) {
> - curmin = w->s->lb_value;
> - }
The initial value of curmin is assigned above the loop:
curmin = (&p->lb_workers[0])->s->lb_value;
I think you can remove that assignment. It happens without checking
with "JK_WORKER_USABLE()" and thus contradicts with the new code
below.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174825 - /tomcat/jk/trunk/xdocs/reference/workers.xml
Author: kkolinko Date: Fri Sep 23 15:11:49 2011 New Revision: 1174825 URL: http://svn.apache.org/viewvc?rev=1174825&view=rev Log: Followup to r1174449. The Next method is added in 1.2.33, as changelog says. Modified: tomcat/jk/trunk/xdocs/reference/workers.xml Modified: tomcat/jk/trunk/xdocs/reference/workers.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1174825&r1=1174824&r2=1174825&view=diff == --- tomcat/jk/trunk/xdocs/reference/workers.xml (original) +++ tomcat/jk/trunk/xdocs/reference/workers.xml Fri Sep 23 15:11:49 2011 @@ -583,7 +583,7 @@ application. This feature has been added in version 1.2.9. The Session method has been added in version 1.2.20, -the Next method in version 1.2.32.. +the Next method in version 1.2.33. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request
https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 --- Comment #9 from charlie 2011-09-23 15:14:21 UTC --- Yes, RECYCLE_FACADES=true didn't work for us. We will try the patch from the comment 8 and let you know. Thanks. -- 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: r1174830 - /tomcat/jk/trunk/native/common/jk_lb_worker.c
Author: rjung
Date: Fri Sep 23 15:19:31 2011
New Revision: 1174830
URL: http://svn.apache.org/viewvc?rev=1174830&view=rev
Log:
Remove line that should have gone with r1174468.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1174830&r1=1174829&r2=1174830&view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Sep 23 15:19:31 2011
@@ -629,7 +629,6 @@ static jk_uint64_t decay_load(lb_worker_
ajp_worker_t *aw;
JK_TRACE_ENTER(l);
-curmin = (&p->lb_workers[0])->s->lb_value;
for (i = 0; i < p->num_of_workers; i++) {
w = &p->lb_workers[i];
if (p->lbmethod != JK_LB_METHOD_BUSYNESS) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1174468 - /tomcat/jk/trunk/native/common/jk_lb_worker.c
On 23.09.2011 16:47, Konstantin Kolinko wrote:
> 2011/9/23 :
>> Author: rjung
>> Date: Fri Sep 23 00:46:55 2011
>> New Revision: 1174468
>>
>> URL: http://svn.apache.org/viewvc?rev=1174468&view=rev
>> Log:
>> When using the alternate decay for the "Next"
>> session lb method, calculate curmin only for
>> active workers. Otherwise curmin will quickly
>> stabilize at "0".
>>
>> Decay non-active workers as well so that they
>> do not report fantasy values.
>>
>> Modified:
>>tomcat/jk/trunk/native/common/jk_lb_worker.c
>>
>> Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1174468&r1=1174467&r2=1174468&view=diff
>> ==
>> --- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
>> +++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Sep 23 00:46:55 2011
>> @@ -624,7 +624,7 @@ static jk_uint64_t decay_load(lb_worker_
>> {
>> unsigned int i;
>> jk_uint64_t curmax = 0;
>> -jk_uint64_t curmin;
>> +jk_uint64_t curmin = 0;
>> lb_sub_worker_t *w;
>> ajp_worker_t *aw;
>>
>> @@ -636,9 +636,6 @@ static jk_uint64_t decay_load(lb_worker_
>> if (p->lbmethod != JK_LB_METHOD_NEXT) {
>> w->s->lb_value >>= exponent;
>> }
>> -if (w->s->lb_value < curmin) {
>> -curmin = w->s->lb_value;
>> -}
>
> The initial value of curmin is assigned above the loop:
> curmin = (&p->lb_workers[0])->s->lb_value;
>
> I think you can remove that assignment. It happens without checking
> with "JK_WORKER_USABLE()" and thus contradicts with the new code
> below.
Correct, not removing the line was an oversight. It's gone with r1174830.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174882 - in /tomcat/trunk/java/org/apache/tomcat/util/net/jsse: JSSESupport.java res/LocalStrings.properties
Author: markt
Date: Fri Sep 23 16:55:21 2011
New Revision: 1174882
URL: http://svn.apache.org/viewvc?rev=1174882&view=rev
Log:
Use the StringManager for i18n
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1174882&r1=1174881&r2=1174882&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Fri Sep
23 16:55:21 2011
@@ -35,6 +35,7 @@ import javax.security.cert.X509Certifica
import org.apache.tomcat.util.net.SSLSessionManager;
import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.res.StringManager;
/** JSSESupport
@@ -56,6 +57,9 @@ class JSSESupport implements SSLSupport,
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(JSSESupport.class);
+private static final StringManager sm =
+StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
+
private static final Map keySizeCache =
new WeakHashMap();
@@ -94,7 +98,7 @@ class JSSESupport implements SSLSupport,
try {
certs = session.getPeerCertificates();
} catch( Throwable t ) {
-log.debug("Error getting client certs",t);
+log.debug(sm.getString("jsseSupport.clientCertError"), t);
return null;
}
if( certs==null ) return null;
@@ -115,7 +119,8 @@ class JSSESupport implements SSLSupport,
x509Certs[i] = (java.security.cert.X509Certificate)
cf.generateCertificate(stream);
} catch(Exception ex) {
-log.info("Error translating cert " + certs[i], ex);
+log.info(sm.getString(
+"jseeSupport.certTranslationError", certs[i]), ex);
return null;
}
}
@@ -153,7 +158,7 @@ class JSSESupport implements SSLSupport,
protected void handShake() throws IOException {
if( ssl.getWantClientAuth() ) {
-log.debug("No client cert sent for want");
+log.debug(sm.getString("jsseSupport.noCertWant"));
} else {
ssl.setNeedClientAuth(true);
}
@@ -161,7 +166,7 @@ class JSSESupport implements SSLSupport,
if (ssl.getEnabledCipherSuites().length == 0) {
// Handshake is never going to be successful.
// Assume this is because handshakes are disabled
-log.warn("SSL server initiated renegotiation is disabled, closing
connection");
+log.warn(sm.getString("jsseSupport.serverRenegDisabled"));
session.invalidate();
ssl.close();
return;
@@ -180,7 +185,7 @@ class JSSESupport implements SSLSupport,
try {
in.read(b);
} catch(SSLException sslex) {
-log.info("SSL Error getting client Certs",sslex);
+log.info(sm.getString("jsseSupport.clientCertError"), sslex);
throw sslex;
} catch (IOException e) {
// ignore - presumably the timeout
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties?rev=1174882&r1=1174881&r2=1174882&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
Fri Sep 23 16:55:21 2011
@@ -17,4 +17,9 @@ jsse.alias_no_key_entry=Alias name {0} d
jsse.keystore_load_failed=Failed to load keystore type {0} with path {1} due
to {2}
jsse.invalid_ssl_conf=SSL configuration is invalid due to {0}
jsse.invalid_truststore_password=The provided trust store password could not
be used to unlock and/or validate the trust store. Retrying to access the trust
store with a null password which will skip validation.
-jsse.invalidTrustManagerClassName=The trustManagerClassName provided [{0}]
does not implement javax.net.ssl.TrustManager
\ No newline at end of file
+jsse.invalidTrustManagerClassName=The trustManagerClassName provided [{0}]
does not implement javax.net.ssl.TrustManager
+jsseSupport.clientCertError=Error trying to obtain a certificate from the
client
+jseeSupport.certTranslationError=Error translating certificate [{0}]
+jsseSupport.noCertWant=No client certificate sent for want
+js
svn commit: r1174884 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Author: markt
Date: Fri Sep 23 16:58:50 2011
New Revision: 1174884
URL: http://svn.apache.org/viewvc?rev=1174884&view=rev
Log:
Fix SSL + BIO + Java 7
The implementation of InputStream.read(byte[0]) has changed so it always
returns zero without checking for EOF. This broke the old way of doing things.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1174884&r1=1174883&r2=1174884&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Fri Sep
23 16:58:50 2011
@@ -175,7 +175,7 @@ class JSSESupport implements SSLSupport,
InputStream in = ssl.getInputStream();
int oldTimeout = ssl.getSoTimeout();
ssl.setSoTimeout(1000);
-byte[] b = new byte[0];
+byte[] b = new byte[1];
listener.reset();
ssl.startHandshake();
int maxTries = 60; // 60 * 1000 = example 1 minute time out
@@ -183,7 +183,14 @@ class JSSESupport implements SSLSupport,
if (log.isTraceEnabled())
log.trace("Reading for try #" + i);
try {
-in.read(b);
+int read = in.read(b);
+if (read > 0) {
+// Shouldn't happen as all input should have been swallowed
+// before trying to do the handshake. If it does, something
+// went wrong so lets bomb out now.
+throw new SSLException(
+sm.getString("jsseSupport.unexpectedData"));
+}
} catch(SSLException sslex) {
log.info(sm.getString("jsseSupport.clientCertError"), sslex);
throw sslex;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174899 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/appdev/sample/src/mypackage/Hello.java
Author: kkolinko
Date: Fri Sep 23 17:31:33 2011
New Revision: 1174899
URL: http://svn.apache.org/viewvc?rev=1174899&view=rev
Log:
Merged revision( 1174343 from tomcat/trunk:
Fix Eclipse warnings in a sample class in documentation
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 17:31:33 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,1174353
+/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,1174343,1174353
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java?rev=1174899&r1=1174898&r2=1174899&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
Fri Sep 23 17:31:33 2011
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRes
public final class Hello extends HttpServlet {
+private static final long serialVersionUID = 1L;
/**
* Respond to a GET request for the content produced by
@@ -47,6 +48,7 @@ public final class Hello extends HttpSer
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
+@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174912 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Author: kkolinko
Date: Fri Sep 23 17:42:43 2011
New Revision: 1174912
URL: http://svn.apache.org/viewvc?rev=1174912&view=rev
Log:
Merged revision 1174338 from tomcat/trunk:
Remove unused member variable
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 17:42:43 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,1174343,1174353
+/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,1174338,1174343,1174353
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1174912&r1=1174911&r2=1174912&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Fri Sep 23 17:42:43 2011
@@ -176,7 +176,6 @@ public class InternalNioOutputBuffer ext
if ( selector != null ) pool.put(selector);
}
if ( block ) bytebuffer.clear(); //only clear
-this.total = 0;
return written;
}
@@ -212,7 +211,6 @@ public class InternalNioOutputBuffer ext
}
-private int total = 0;
private synchronized void addToBB(byte[] buf, int offset, int length)
throws IOException {
while (length > 0) {
int thisTime = length;
@@ -227,7 +225,6 @@ public class InternalNioOutputBuffer ext
socket.getBufHandler().getWriteBuffer().put(buf, offset, thisTime);
length = length - thisTime;
offset = offset + thisTime;
-total += thisTime;
}
NioEndpoint.KeyAttachment ka =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
if ( ka!= null ) ka.access();//prevent timeouts for just doing client
writes
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174914 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java
Author: kkolinko
Date: Fri Sep 23 17:47:08 2011
New Revision: 1174914
URL: http://svn.apache.org/viewvc?rev=1174914&view=rev
Log:
Merged revision 1174337 from tomcat/trunk:
Remove unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 17:47:08 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,1174338,1174343,1174353
+/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,1174337-1174338,1174343,1174353
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1174914&r1=1174913&r2=1174914&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Fri Sep 23 17:47:08 2011
@@ -1379,13 +1379,6 @@ public class DefaultServlet
String name = cacheEntry.name;
-// Number of characters to trim from the beginnings of filenames
-int trim = name.length();
-if (!name.endsWith("/"))
-trim += 1;
-if (name.equals("/"))
-trim = 1;
-
// Prepare a writer to a buffered area
ByteArrayOutputStream stream = new ByteArrayOutputStream();
OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174921 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappLoader.java
Author: kkolinko
Date: Fri Sep 23 17:51:56 2011
New Revision: 1174921
URL: http://svn.apache.org/viewvc?rev=1174921&view=rev
Log:
Merged revision 1174330 from tomcat/trunk:
Remove unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 17:51:56 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,1174337-1174338,1174343,1174353
+/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
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1174921&r1=1174920&r2=1174921&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Fri
Sep 23 17:51:56 2011
@@ -1036,7 +1036,6 @@ public class WebappLoader extends Lifecy
// Assemble the class path information from our class loader chain
ClassLoader loader = getClassLoader();
-int layers = 0;
int n = 0;
while (loader != null) {
if (!(loader instanceof URLClassLoader)) {
@@ -1073,7 +1072,6 @@ public class WebappLoader extends Lifecy
n++;
}
loader = loader.getParent();
-layers++;
}
this.classpath=classpath.toString();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174931 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/jsse/JSSESupport.java java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Fri Sep 23 18:14:17 2011
New Revision: 1174931
URL: http://svn.apache.org/viewvc?rev=1174931&view=rev
Log: (empty)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 18:14:17 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
+/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
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=1174931&r1=1174930&r2=1174931&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
Fri Sep 23 18:14:17 2011
@@ -35,6 +35,7 @@ import javax.security.cert.X509Certifica
import org.apache.tomcat.util.net.SSLSessionManager;
import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.res.StringManager;
/** JSSESupport
@@ -56,6 +57,9 @@ class JSSESupport implements SSLSupport,
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(JSSESupport.class);
+private static final StringManager sm =
+StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
+
private static final Map keySizeCache =
new WeakHashMap();
@@ -94,7 +98,7 @@ class JSSESupport implements SSLSupport,
try {
certs = session.getPeerCertificates();
} catch( Throwable t ) {
-log.debug("Error getting client certs",t);
+log.debug(sm.getString("jsseSupport.clientCertError"), t);
return null;
}
if( certs==null ) return null;
@@ -115,7 +119,8 @@ class JSSESupport implements SSLSupport,
x509Certs[i] = (java.security.cert.X509Certificate)
cf.generateCertificate(stream);
} catch(Exception ex) {
-log.info("Error translating cert " + certs[i], ex);
+log.info(sm.getString(
+"jseeSupport.certTranslationError", certs[i]), ex);
return null;
}
}
@@ -153,7 +158,7 @@ class JSSESupport implements SSLSupport,
protected void handShake() throws IOException {
if( ssl.getWantClientAuth() ) {
-log.debug("No client cert sen
Re: svn commit: r1174931 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/jsse/JSSESupport.java java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties webapps/docs/changelog.xm
2011/9/23 : > Author: markt > Date: Fri Sep 23 18:14:17 2011 > New Revision: 1174931 > > URL: http://svn.apache.org/viewvc?rev=1174931&view=rev > Log: (empty) No log message. It is a merge of revisions 1174882,1174884 > + > + Allow the BIO HTTP connector to be used with SSL when running under > Java > + 7. (markt) > + Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1174931 - svn:log
Author: markt Revision: 1174931 Modified property: svn:log Modified: svn:log at Fri Sep 23 18:49:23 2011 -- --- svn:log (original) +++ svn:log Fri Sep 23 18:49:23 2011 @@ -0,0 +1 @@ +Allow the BIO HTTP connector to be used with SSL when running under Java 7. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174975 - /tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
Author: kkolinko Date: Fri Sep 23 19:46:19 2011 New Revision: 1174975 URL: http://svn.apache.org/viewvc?rev=1174975&view=rev Log: Add links to @SuppressWarnings documentation for Eclipse IDE. Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt?rev=1174975&r1=1174974&r2=1174975&view=diff == --- tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt (original) +++ tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Fri Sep 23 19:46:19 2011 @@ -15,7 +15,7 @@ limitations under the License. -The following settings are for Indigo Release +The following settings are for Indigo Release (Eclipse 3.7) W = Warning I = Ignore E = Error @@ -54,4 +54,9 @@ Generic types Annotations - All - W (all additional check boxes) - \ No newline at end of file + +Note: The list of codes supported in @SuppressWarnings annotation in +Eclipse IDE is documented here: + + 3.6: http://help.eclipse.org/helios/topic/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm + 3.7: http://help.eclipse.org/indigo/topic/org.eclipse.jdt.doc.user/tasks/task-suppress_warnings.htm - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1174983 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParserTokenManager.java JJTELParserState.java SimpleCharStream.java Token.java TokenMgrError.java
Author: kkolinko
Date: Fri Sep 23 19:55:27 2011
New Revision: 1174983
URL: http://svn.apache.org/viewvc?rev=1174983&view=rev
Log:
Ignore warnings in classes generated with JavaCC/JJTree
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Fri Sep 23 19:55:27
2011
@@ -3,6 +3,8 @@ package org.apache.el.parser;
import java.io.StringReader;
import javax.el.ELException;
+
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParser/*@bgen(jjtree)*/implements ELParserTreeConstants,
ELParserConstants {/*@bgen(jjtree)*/
protected JJTELParserState jjtree = new JJTELParserState();public static
Node parse(String ref) throws ELException
{
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Fri Sep 23
19:55:27 2011
@@ -2,6 +2,7 @@
package org.apache.el.parser;
/** Token Manager. */
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParserTokenManager implements ELParserConstants
{
Modified: tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java Fri Sep 23
19:55:27 2011
@@ -1,6 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version
5.0 */
package org.apache.el.parser;
+@SuppressWarnings("all") // Ignore warnings in generated code
public class JJTELParserState {
private java.util.List nodes;
private java.util.List marks;
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java Fri Sep 23
19:55:27 2011
@@ -6,7 +6,7 @@ package org.apache.el.parser;
* An implementation of interface CharStream, where the stream is assumed to
* contain only ASCII characters (without unicode processing).
*/
-
+@SuppressWarnings("all") // Ignore warnings in generated code
public class SimpleCharStream
{
/** Whether parser is static. */
Modified: tomcat/trunk/java/org/apache/el/parser/Token.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/Token.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/Token.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/Token.java Fri Sep 23 19:55:27 2011
@@ -5,7 +5,7 @@ package org.apache.el.parser;
/**
* Describes the input token stream.
*/
-
+@SuppressWarnings("all") // Ignore warnings in generated code
public class Token implements java.io.Serializable {
/**
Modified: tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=1174983&r1=1174982&r2=1174983&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java Fri Sep 23
19:55:27 2011
@@ -3,6 +3,7 @@
package org.apache.el.parser;
/** Token Manager Error. */
+@SuppressWarnings("all") // Ignore warnings in generated code
public class TokenMgrError extends Error
{
-
To unsubscribe, e-mail: dev-unsubs
Re: svn commit: r1165601 - /tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
2011/9/16 :
> ma...@apache.org wrote:
>
>>Konstantin Kolinko wrote:
>>
>>>2011/9/6 :
Author: markt
Date: Tue Sep 6 11:12:17 2011
New Revision: 1165601
URL: http://svn.apache.org/viewvc?rev=1165601&view=rev
Log:
Add another 3.7+ note
Modified:
>>> tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
@@ -50,6 +50,7 @@
Generic types
- All - W
+ (ignore unavoidable generics warnings) (Eclipse 3.7+)
>>>
>>>What value do you mean for that checkbox?
>>> [ ] or [x] Ignore unavoidable generic type problems
>>
>>Checked.
>>
>>>My setting was "[ ]".
>>>
>>>When I changed it to "[x]" I got +11 more warnings than before
>>>(Those are "Unnecessary @SuppressWarnings("unchecked")").
>>
>>Same here.
>>
>>>As far as I do not grasp what those "unavoidable" problems are, I have
>>>slight preference to keep it as "[ ]".
>>
>>My preference was for checked since it would allow me to delete some
>>stuff. I haven't got around to that yet.
>>
Looking at what warnings this flag suppresses, I start to like it.
But, the compiler in Oracle JDK 6 is not so clever.
When building with build.xml as is, it prints a warning that problems are there:
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
If I add , it lists all those warnings,
and it can be seen that those are the ones that are ignored by Eclipse
if this "Ignore unavoidable generic type problems" flag is enabled.
E.g. in AbstractReplicatedMap class.
I have some hope that if all those places will be marked with
@SuppressWarnings("unchecked") then javac warning will disappear.
The "ignore unavoidable .. problems" flag makes finding and fixing
them a bit harder.
It confirms my preference for having it turned off.
For information, some examples of these are the generic type problems
that are suppressed by this flag:
1) Documentation in Eclipse mentions the following:
[[[
As an example, a type may be forced to use raw types in its method
signatures and return types because the methods it overrides from a
super type are declared to use raw types in the first place.
]]]
Sounds like the code in ExpressionEvaluatorImpl, that extends old
deprecated class from JSP EL API. The API that it implements does not
use generics.
2) Casting from Object to a generic type.
This conversion is itself unchecked by its nature, so it cannot be avoided.
E.g. (in AbstractHttp11Processor):
@SuppressWarnings("unchecked")
AbstractInputBuffer internalBuffer = (AbstractInputBuffer)
request.getInputBuffer();
or (in VariableMapperImpl):
@SuppressWarnings("unchecked")
@Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.vars = (Map) in.readObject();
}
3) Implementation details when non-generics class extends generics class:
e.g. AbstractReplicatedMap.
This is not much, because the warnings are already there. If the flag
is unchecked there are just twice more warnings there.
Either annotating the whole class with @SuppressWarnings, or changing
its implementation to use genetics would be a solution here,
regardless of the flag.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175042 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/
Author: kkolinko
Date: Fri Sep 23 21:41:03 2011
New Revision: 1175042
URL: http://svn.apache.org/viewvc?rev=1175042&view=rev
Log:
Merged revision 1174983 from tomcat/trunk:
Ignore warnings in classes generated with JavaCC/JJTree
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 21:41:03 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
+/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
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java Fri Sep 23
21:41:03 2011
@@ -3,6 +3,8 @@ package org.apache.el.parser;
import java.io.StringReader;
import javax.el.ELException;
+
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParser/*@bgen(jjtree)*/implements ELParserTreeConstants,
ELParserConstants {/*@bgen(jjtree)*/
protected JJTELParserState jjtree = new JJTELParserState();public static
Node parse(String ref) throws ELException
{
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Fri Sep 23 21:41:03 2011
@@ -2,6 +2,7 @@
package org.apache.el.parser;
/** Token Manager. */
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParserTokenManager implements ELParserConstants
{
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==
--- t
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
Reviewing Eclipse warnings I noticed a bug in this commit.
2011/9/22 :
> Author: rjung
> Date: Thu Sep 22 15:01:08 2011
> New Revision: 1174181
>
> URL: http://svn.apache.org/viewvc?rev=1174181&view=rev
> Log:
> - Pull up members "cluster" and "notifyListenersOnReplication"
> to common base class.
> - Pull up common clone code to base class.
> - Add sessionAttributeFilter to clone method
> - Reduce visibility of notifyListenersOnReplication
>
> Backport of r1173088, r1173090, r1173461 from trunk.
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
>
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
(..)
> @@ -259,12 +225,9 @@ public class BackupManager extends Clust
> @Override
> public ClusterManager cloneFromTemplate() {
> BackupManager result = new BackupManager();
> + clone(result);
> result.mExpireSessionsOnShutdown = mExpireSessionsOnShutdown;
> - result.name = "Clone-from-"+name;
> - result.cluster = cluster;
> - result.notifyListenersOnReplication = notifyListenersOnReplication;
> result.mapSendOptions = mapSendOptions;
> - result.maxActiveSessions = maxActiveSessions;
> result.rpcTimeout = rpcTimeout;
> return result;
> }
> + 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).
The old code was assigning the value to BackupManager.name, which is
an instance field.
> + copy.cluster = getCluster();
> + copy.maxActiveSessions = getMaxActiveSessions();
> + copy.notifyListenersOnReplication = isNotifyListenersOnReplication();
> + copy.setSessionAttributeFilter(getSessionAttributeFilter());
> + }
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.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175046 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Sep 23 22:03:55 2011 New Revision: 1175046 URL: http://svn.apache.org/viewvc?rev=1175046&view=rev Log: Add a note. 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=1175046&r1=1175045&r2=1175046&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 23 22:03:55 2011 @@ -80,6 +80,9 @@ PATCHES PROPOSED TO BACKPORT: So it is a straight backport of r1172259, but instead of r1174181 copy the new attribute 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
DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request
https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 --- Comment #10 from charlie 2011-09-24 03:44:49 UTC --- Mark, After applying the patch from comment 8, we get these in our logs (quite a alot). But we no longer have our problem of getting the previous IP address. 03:17:04,436 ERROR [Request] THREADID:292###PATCH###: Access to Request at invalid point in lifecycle. Returning null for getRemoteAddr(). -- 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
[Tomcat Wiki] Update of "PoweredBy" by StivenHolmes
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by StivenHolmes:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=364&rev2=365
=== ngasi.com ===
{{http://www.ngasi.com/ngweb/images/logo.png}}
[[http://www.ngasi.com/|ngasi.com]] is home to NGASI AppServer Manager. NGASI
AppServer Manager automates the installation and management of Tomcat across
multiple systems. It also creates and manages Load-Balanced farms of Tomcat
instances.
+
=== MyOtherDrive ===
{{http://www.myotherdrive.com/images/myotherdrive-logo-v4.jpg}}
[[http://www.MyOtherDrive.com|MyOtherDrive]] an Online Backup and File Sharing
provider, runs on Apache Tomcat.
@@ -543, +544 @@
* A
[[http://developers.slashdot.org/article.pl?sid=02/08/19/2042235&tid=108|SlashDot]]
discussion about using Tomcat in production.
* An
[[http://search400.techtarget.com/tip/1,289483,sid3_gci953013,00.html?bucket=ETA|article]]
from The Value Manager for IT Insights on Tomcat's value.
-
+ * Different [[http://myinternetmarketingservices.com|Services]] for
websites. Apache Tomcat tools for configuration and management.
* Dan Hansen wrote
[[http://www.javaworld.com/javaworld/jw-06-2004/jw-0628-build.html|an article]]
for JavaWorld in 2004 showing how to use Tomcat to put together a build system
in two days.
* Get Reviews for the Hosts offering Tomcat Hosting on Shared Servers --
[[http://www.hostingcomments.com|Web Hosting Reviews]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
