Bug report for Taglibs [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request| |39053|Inf|Enh|2006-03-21|include Tomcat embedded sample| |39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep| |39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe| |40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code | |40402|New|Enh|2006-09-03|Manager should display Exceptions | |40510|New|Enh|2006-09-14|installer does not create shortcuts for all users | |40712|New|Enh|2006-10-10|Realm admin error.| |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C| |41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co| |41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume| |41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar| |41673|New|Enh|2007-02-21|Jasper output the message of compiling error using| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af| |41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe| |42416|New|Enh|2007-05-14|Tomcat startup hangs and AJP13 connector port 8009| |43423|New|Enh|2007-09-18|catalina.sh -force too fast | |43538|New|Enh|2007-10-02|[patch] Show the hostname and IP address in the ma| |43796|Inf|Enh|2007-11-05|Add MIME type mapping for the "log" extension | |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |43991|New|Enh|2007-11-29|Contributing a URLResourceFactory | |44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr| |44309|New|Enh|2008-01-28|Possible overriding the security state of the conn| |44897|New|Enh|2008-04-28|HttpServletRequest's .getParameter(String) method | |44904|
Bug report for Tomcat 6 [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro| |41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso| |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |41992|New|Enh|2007-03-30|Need ability to set OS process title | |42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend | |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43400|New|Enh|2007-09-14|enum support for tag libs | |43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre| |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool | |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w| |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44299|New|Enh|2008-01-26|Provider manager app with a log out button| |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45283|Opn|Enh|2008-06-25|Provide a JSR196 implementation | |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!| |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46451|New|Enh|2008-12-30|Configure svn:bugtraq properties | |46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts | |46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform | |46655|New|Enh|2009-02-03|keystore's password handler | |46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings | |46819|New|Enh|2009-03-07|Remove redundant object instantiations in JspRunti| |46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch| |47061|New|Enh|2009-04-21|JDBCStore for saving sessions doesn't support data| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47230|
Bug report for Tomcat 7 [2011/01/16]
+---+
| Bugzilla Bug ID |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) |
| | +-+
| | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major |
| | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial |
| | | +-+
| | | | Date Posted |
| | | | +--+
| | | | | Description |
| | | | | |
|48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|48870|New|Enh|2010-03-08|avoid parallel arrays of base types |
|48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post |
|49122|Opn|Enh|2010-04-14|Update of ROOT application index.html |
|49159|New|Enh|2010-04-20|Improve ThreadLocal memory leak clean-up |
|49165|New|Enh|2010-04-21|Enhancement - Allow %{TIME_FORMAT}t As Configurati|
|49284|New|Enh|2010-05-12|Implement SSL renegotiation for the NIO connector |
|49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca|
|49318|New|Enh|2010-05-20|add a Negotiate (Kerberos/NTLM) authenticator / in|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49591|New|Enh|2010-07-13|Custom error page always uses Transfer-Encoding: c|
|49683|New|Nor|2010-08-01|Separate keep-alive and connection timeout with AP|
|49711|New|Enh|2010-08-05|HttpServletRequest#getParts() does not work in a F|
|49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm|
|49821|New|Enh|2010-08-25|Tomcat CLI|
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50306|New|Enh|2010-11-19|Detect stuck threads |
|50325|New|Enh|2010-11-24|Update Tomcat to use JRE provided solutions for CV|
|50353|New|Enh|2010-11-27|Calling asyncContext.getResponse() returns null af|
|50405|Inf|Nor|2010-12-02|Null Pointer Exception at Coyote Adapter |
|50504|New|Enh|2010-12-21|Allow setting query string character set trough re|
|50526|New|Enh|2010-12-28|Clarify that JavaMail Session JNDI resource factor|
|50535|New|Enh|2011-01-01|Support resources serving from /WEB-INF/classes/ME|
|50570|New|Enh|2011-01-11|Allow explicit use of FIPS mode in APR connector |
|50582|New|Reg|2011-01-14|Small JSPs do not set Content-Length (and use chun|
+-+---+---+--+--+
| Total 28 bugs |
+---+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46179|Opn|Maj|2008-11-10|apr ssl client authentication | |48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |49595|New|Cri|2010-07-15|Tomcat crashes in tcnative-1.dll frequently | |49795|New|Nor|2010-08-22|Crash in Socket.destroy | |50394|New|Nor|2010-12-01|InternalAprInputBuffer.fill() doesn't deal correct| +-+---+---+--+--+ | Total7 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk | |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort | |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work | |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i| |47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |48940|New|Maj|2010-03-18|IIS to Tomcat occasionally fails on POST with T-E | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49048|New|Nor|2010-04-05|ACL not applied to redirect URLs | |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49413|Opn|Reg|2010-06-09|Apache Mod_jk 1.2.30 is shutting down communicatio| |49469|New|Enh|2010-06-19|Workers status page has negative number of connect| |49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c| |50233|New|Cri|2010-11-08|support long URLs (more than 2048)| |50304|
Bug report for Tomcat Modules [2011/01/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |49953|Opn|Nor|2010-09-17|Missing @Override annotations | |50565|New|Min|2011-01-10|Static variables should be accessed in a static wa| |50566|New|Nor|2011-01-10|Duplicate assignment to connection variable | |50567|New|Enh|2011-01-10|Classpath does not need to reference tomcat-dbcp.j| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| +-+---+---+--+--+ | Total 10 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50582] Small JSPs do not set Content-Length (and use chunked encoding) if AccessLogValve is configured
https://issues.apache.org/bugzilla/show_bug.cgi?id=50582 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2011-01-16 07:55:00 EST --- The access logging has been refactored to change the point when logging is triggered to after the point when the response has been written so a flush (which was what was forcing the use of chunked encoding) is not required to obtain an accurate count of bytes written. The fix is in 7.0.x and will be included in 7.0.7 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: r1059548 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/coyote/http11/ webapps/docs/
Author: markt
Date: Sun Jan 16 12:55:55 2011
New Revision: 1059548
URL: http://svn.apache.org/viewvc?rev=1059548&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50582
Refactor access logging so chunked encoding is not forced if bytes sent is
logged
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1059548&r1=1059547&r2=1059548&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sun Jan
16 12:55:55 2011
@@ -404,6 +404,9 @@ public class CoyoteAdapter implements Ad
async = true;
} else if (!comet) {
response.finishResponse();
+((Context) request.getMappingData().context).logAccess(request,
+response,
+System.currentTimeMillis() - req.getStartTime(),
false);
req.action(ActionCode.POST_REQUEST , null);
}
@@ -435,9 +438,10 @@ public class CoyoteAdapter implements Ad
Request request = (Request) req.getNote(ADAPTER_NOTES);
Response response = (Response) res.getNote(ADAPTER_NOTES);
-
+boolean create = false;
+
if (request == null) {
-
+create = true;
// Create objects
request = connector.createRequest();
request.setCoyoteRequest(req);
@@ -460,8 +464,10 @@ public class CoyoteAdapter implements Ad
connector.getService().getContainer().logAccess(
request, response, time, true);
-request.recycle();
-response.recycle();
+if (create) {
+request.recycle();
+response.recycle();
+}
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1059548&r1=1059547&r2=1059548&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Sun Jan 16
12:55:55 2011
@@ -538,36 +538,14 @@ public class AccessLogValve extends Valv
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
-if (getState().isAvailable() && getEnabled()) {
-final String t1Name = AccessLogValve.class.getName()+".t1";
-// Pass this request on to the next valve in our pipeline
-long t1 = System.currentTimeMillis();
-boolean asyncdispatch = request.isAsyncDispatching();
-if (!asyncdispatch) {
-request.setAttribute(t1Name, Long.valueOf(t1));
-}
-
-getNext().invoke(request, response);
-
-//we're not done with the request
-if (request.isAsyncDispatching()) {
-return;
-} else if (asyncdispatch && request.getAttribute(t1Name)!=null) {
-t1 = ((Long)request.getAttribute(t1Name)).longValue();
-}
-
-long t2 = System.currentTimeMillis();
-long time = t2 - t1;
-
-log(request,response, time);
-} else
-getNext().invoke(request, response);
+getNext().invoke(request, response);
}
@Override
public void log(Request request, Response response, long time) {
-if (logElements == null || condition != null
+if (!getState().isAvailable() || !getEnabled() ||
+logElements == null || condition != null
&& null != request.getRequest().getAttribute(condition)) {
return;
}
@@ -1057,7 +1035,9 @@ public class AccessLogValve extends Valv
@Override
public void addElement(StringBuilder buf, Date date, Request request,
Response response, long time) {
-long length = response.getBytesWritten(true);
+// Don't need to flush since trigger for log message is after the
+// response has been committed
+long length = response.getBytesWritten(false);
if (length <= 0 && conversion) {
buf.append('-');
} else {
Modifie
svn commit: r1059553 - in /tomcat/trunk: res/findbugs/ test/org/apache/catalina/tribes/test/interceptors/ test/org/apache/catalina/tribes/test/io/ test/org/apache/catalina/tribes/test/membership/ test
Author: markt
Date: Sun Jan 16 13:24:49 2011
New Revision: 1059553
URL: http://svn.apache.org/viewvc?rev=1059553&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059553&r1=1059552&r2=1059553&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Jan 16 13:24:49
2011
@@ -59,6 +59,11 @@
+
+
+
+
+
@@ -85,4 +90,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
Sun Jan 16 13:24:49 2011
@@ -84,7 +84,7 @@ public class TestOrderInterceptor extend
Member[] dest = channels[0].getMembers();
final AtomicInteger value = new AtomicInteger(0);
for ( int i=0; i<100; i++ ) {
-channels[0].send(dest,new Integer(value.getAndAdd(1)),0);
+channels[0].send(dest,Integer.valueOf(value.getAndAdd(1)),0);
}
Thread.sleep(5000);
for ( int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
Sun Jan 16 13:24:49 2011
@@ -111,7 +111,7 @@ public class TestSenderConnections exten
}
}
-public class TestMsgListener implements ChannelListener {
+public static class TestMsgListener implements ChannelListener {
public String name = null;
public TestMsgListener(String name) {
this.name = name;
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
Sun Jan 16 13:24:49 2011
@@ -91,7 +91,7 @@ public class TestDomainFilter
super.tearDown();
}
-public class TestMbrListener
+public static class TestMbrListener
implements MembershipListener {
public String name = null;
public TestMbrListener(String name) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
Sun Jan 16 13:24:49 2011
@@ -88,7 +88,7 @@ public class TestMemberArrival
super.tearDown();
}
-public class TestMbrListener
+public static class TestMbrListener
implements MembershipListener {
public String name = null;
svn commit: r1059560 - in /tomcat/trunk/java/org/apache: catalina/tribes/transport/ catalina/tribes/transport/bio/ catalina/tribes/transport/nio/ tomcat/util/net/ tomcat/util/net/res/
Author: markt
Date: Sun Jan 16 13:54:28 2011
New Revision: 1059560
URL: http://svn.apache.org/viewvc?rev=1059560&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Sun Jan 16 13:54:28 2011
@@ -88,10 +88,12 @@ public abstract class PooledSender exten
return (queue==null)?false:queue.checkIdleKeepAlive();
}
+@Override
public void add(Member member) {
// no op, senders created upon demands
}
+@Override
public void remove(Member member) {
//no op for now, should not cancel out any keys
//can create serious sync issues
@@ -100,7 +102,7 @@ public abstract class PooledSender exten
}
// - Inner Class
-private class SenderQueue {
+private static class SenderQueue {
private int limit = 25;
PooledSender parent = null;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Sun Jan 16 13:54:28 2011
@@ -82,7 +82,11 @@ public class BioReceiver extends Receive
setListen(false);
try {
this.serverSocket.close();
-} catch (Exception x) {/* Ignore */}
+} catch (Exception x) {
+if (log.isDebugEnabled()) {
+log.debug("Failed to close socket", x);
+}
+}
super.stop();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
Sun Jan 16 13:54:28 2011
@@ -67,8 +67,20 @@ public class BioReplicationTask extends
} catch ( Exception x ) {
log.error("Unable to service bio socket", x);
}finally {
-try {socket.close();}catch ( Exception e){/* Ignore */}
-try {reader.close();}catch ( Exception e){/* Ignore */}
+try {
+socket.close();
+}catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug("Failed to close socket", e);
+}
+}
+try {
+reader.close();
+}catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug("Failed to close reader", e);
+}
+}
reader = null;
socket = null;
}
@@ -158,8 +170,20 @@ public class BioReplicationTask extends
@Override
public void close() {
setDoRun(false);
-try {socket.close();}catch ( Exception e){/* Ignore */}
-try {reader.close();}catch ( Exception e){/* Ignore */}
+try {
+socket.close();
+}catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug("Failed to close socket", e);
+}
+}
+try {
+reader.close();
+}catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug("Failed to close reader", e);
+}
+}
reader = null;
socket = null;
super.close();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/a
svn commit: r1059563 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: LocalStrings.properties PooledSender.java
Author: markt
Date: Sun Jan 16 14:09:28 2011
New Revision: 1059563
URL: http://svn.apache.org/viewvc?rev=1059563&view=rev
Log:
Fix FindBugs warnings
Remove unused i18n strings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties?rev=1059563&r1=1059562&r2=1059563&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
Sun Jan 16 14:09:28 2011
@@ -13,11 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AsyncSocketSender.create.thread=Create sender [{0}:{1,number,integer}] queue
thread to tcp background replication
-AsyncSocketSender.queue.message=Queue message to [{0}:{1,number,integer}]
id=[{2}] size={3}
-AsyncSocketSender.send.error=Unable to asynchronously send session with
id=[{0}] - message will be ignored.
-AsyncSocketSender.queue.empty=Queue in sender [{0}:{1,number,integer}]
returned null element!
-cluster.mbean.register.already=MBean {0} already registered!
IDataSender.ack.eof=EOF reached at local port [{0}:{1,number,integer}]
IDataSender.ack.receive=Got ACK at local port [{0}:{1,number,integer}]
IDataSender.ack.missing=Unable to read acknowledgement from
[{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and
trying again.
@@ -41,12 +36,7 @@ IDataSender.senderModes.Instantiate=Can'
IDataSender.senderModes.Missing=Can't configure a data replication sender for
mode {0}
IDataSender.senderModes.Resources=Can't load data replication sender mapping
list
IDataSender.stats=Send stats from [{0}:{1,number,integer}], Nr of bytes
sent={2,number,integer} over {3} = {4,number,integer} bytes/request, processing
time {5,number,integer} msec, avg processing time {6,number,integer} msec
-PoolSocketSender.senderQueue.sender.failed=PoolSocketSender create new sender
to [{0}:{1,number,integer}] failed
-PoolSocketSender.noMoreSender=No socket sender available for client
[{0}:{1,number,integer}] did it disappeared?
-ReplicationTransmitter.getProperty=get property {0}
-ReplicationTransmitter.setProperty=set property {0}: {1} old value {2}
-ReplicationTransmitter.started=Start ClusterSender at cluster {0} with name {1}
-ReplicationTransmitter.stopped=Stopped ClusterSender at cluster {0} with name
{1}
+PooledSender.senderDisconnectFail=Failed to disconnect sender
ReplicationValve.crossContext.add=add Cross Context session replication
container to replicationValve threadlocal
ReplicationValve.crossContext.registerSession=register Cross context session
id={0} from context {1}
ReplicationValve.crossContext.remove=remove Cross Context session replication
container from replicationValve threadlocal
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=1059563&r1=1059562&r2=1059563&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Sun Jan 16 14:09:28 2011
@@ -20,6 +20,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.util.StringManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Title:
@@ -33,6 +36,10 @@ import org.apache.catalina.tribes.Member
*/
public abstract class PooledSender extends AbstractSender implements
MultiPointSender {
+private static final Log log = LogFactory.getLog(PooledSender.class);
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
private SenderQueue queue = null;
private int poolSize = 25;
public PooledSender() {
@@ -189,7 +196,15 @@ public abstract class PooledSender exten
inuse.remove(sender);
//just in case the limit has changed
if ( notinuse.size() < this.getLimit() ) notinuse.add(sender);
-else try {sender.disconnect(); } catch ( Exception ignore){}
+else
+try {
+sender.disconnect();
+} catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(
+"PooledSender.senderDisconnectFail"), e);
+
svn commit: r1059583 - /tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
Author: markt
Date: Sun Jan 16 15:29:38 2011
New Revision: 1059583
URL: http://svn.apache.org/viewvc?rev=1059583&view=rev
Log:
Rename variables to start with lower case letter to make code easier to read
Modified:
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java?rev=1059583&r1=1059582&r2=1059583&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java Sun Jan 16
15:29:38 2011
@@ -80,14 +80,14 @@ public class SendMailFactory implements
"javax.mail.internet.MimePartDataSource";
@Override
-public Object getObjectInstance(Object RefObj, Name Nm, Context Ctx,
-Hashtable Env) throws Exception {
-final Reference Ref = (Reference)RefObj;
+public Object getObjectInstance(Object refObj, Name name, Context ctx,
+Hashtable env) throws Exception {
+final Reference ref = (Reference)refObj;
// Creation of the DataSource is wrapped inside a doPrivileged
// so that javamail can read its default properties without
// throwing Security Exceptions
-if (Ref.getClassName().equals(DataSourceClassName)) {
+if (ref.getClassName().equals(DataSourceClassName)) {
return AccessController.doPrivileged(
new PrivilegedAction()
{
@@ -96,7 +96,7 @@ public class SendMailFactory implements
// set up the smtp session that will send the message
Properties props = new Properties();
// enumeration of all refaddr
-Enumeration list = Ref.getAll();
+Enumeration list = ref.getAll();
// current refaddr to be set
RefAddr refaddr;
// set transport to smtp
@@ -111,7 +111,7 @@ public class SendMailFactory implements
MimeMessage message = new MimeMessage(
Session.getInstance(props));
try {
-String from =
(String)Ref.get("mail.from").getContent();
+String from =
(String)ref.get("mail.from").getContent();
message.setFrom(new InternetAddress(from));
message.setSubject("");
} catch (Exception e) {}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059587 - in /tomcat/trunk: java/org/apache/naming/factory/SendMailFactory.java res/findbugs/filter-false-positives.xml
Author: markt
Date: Sun Jan 16 15:41:15 2011
New Revision: 1059587
URL: http://svn.apache.org/viewvc?rev=1059587&view=rev
Log:
Avoid NPEs
Remove FindBugs warning
Modified:
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java?rev=1059587&r1=1059586&r2=1059587&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java Sun Jan 16
15:41:15 2011
@@ -111,10 +111,16 @@ public class SendMailFactory implements
MimeMessage message = new MimeMessage(
Session.getInstance(props));
try {
-String from =
(String)ref.get("mail.from").getContent();
-message.setFrom(new InternetAddress(from));
+RefAddr fromAddr = ref.get("mail.from");
+String from = null;
+if (fromAddr != null) {
+from = (String)ref.get("mail.from").getContent();
+}
+if (from != null) {
+message.setFrom(new InternetAddress(from));
+}
message.setSubject("");
-} catch (Exception e) {}
+} catch (Exception e) {/*Ignore*/}
MimePartDataSource mds = new MimePartDataSource(message);
return mds;
}
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059587&r1=1059586&r2=1059587&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Jan 16 15:41:15
2011
@@ -49,6 +49,13 @@
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059588 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Sun Jan 16 15:49:50 2011
New Revision: 1059588
URL: http://svn.apache.org/viewvc?rev=1059588&view=rev
Log:
Avoid deprecation warning without disabling warnings for the whole class
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1059588&r1=1059587&r2=1059588&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Jan
16 15:49:50 2011
@@ -43,7 +43,6 @@ import javax.servlet.http.HttpSessionAct
import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionContext;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
@@ -274,7 +273,8 @@ public class StandardSession implements
* The HTTP session context associated with this session.
*/
@Deprecated
-protected static volatile HttpSessionContext sessionContext = null;
+protected static volatile
+javax.servlet.http.HttpSessionContext sessionContext = null;
/**
@@ -1137,7 +1137,7 @@ public class StandardSession implements
*/
@Override
@Deprecated
-public HttpSessionContext getSessionContext() {
+public javax.servlet.http.HttpSessionContext getSessionContext() {
if (sessionContext == null)
sessionContext = new StandardSessionContext();
@@ -1860,7 +1860,8 @@ public class StandardSession implements
*/
@Deprecated
-final class StandardSessionContext implements HttpSessionContext {
+final class StandardSessionContext
+implements javax.servlet.http.HttpSessionContext {
protected HashMap dummy = new HashMap();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059598 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: markt
Date: Sun Jan 16 16:16:21 2011
New Revision: 1059598
URL: http://svn.apache.org/viewvc?rev=1059598&view=rev
Log:
Remove unused code
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=1059598&r1=1059597&r2=1059598&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sun Jan
16 16:16:21 2011
@@ -27,16 +27,11 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
-
import org.apache.catalina.Manager;
import org.apache.catalina.SessionListener;
import org.apache.catalina.ha.CatalinaCluster;
@@ -49,7 +44,6 @@ import org.apache.catalina.session.Stand
import org.apache.catalina.session.StandardSession;
import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.catalina.tribes.tipis.ReplicatedMapEntry;
-import org.apache.catalina.util.Enumerator;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -817,55 +811,3 @@ public class DeltaSession extends Standa
if ( accessCount != null ) super.accessCount.set(count);
}
}
-
-// -- Private Class
-
-/**
- * This class is a dummy implementation of the HttpSessionContext
- * interface, to conform to the requirement that such an object be returned
when
- * HttpSession.getSessionContext() is called.
- *
- * @author Craig R. McClanahan
- *
- * @deprecated As of Java Servlet API 2.1 with no replacement. The interface
- * will be removed in a future version of this API.
- */
-
-@Deprecated
-final class StandardSessionContext
-implements HttpSessionContext {
-
-private HashMap dummy = new HashMap();
-
-/**
- * Return the session identifiers of all sessions defined within this
- * context.
- *
- * @deprecated As of Java Servlet API 2.1 with no replacement. This method
- * must return an empty Enumeration and will be
- * removed in a future version of the API.
- */
-@Override
-@Deprecated
-public Enumeration getIds() {
-return (new Enumerator(dummy));
-}
-
-/**
- * Return the HttpSession associated with the specified
- * session identifier.
- *
- * @param id
- *Session identifier for which to look up a session
- *
- * @deprecated As of Java Servlet API 2.1 with no replacement. This method
- * must return null and will be removed in a future version of
- * the API.
- */
-@Override
-@Deprecated
-public HttpSession getSession(String id) {
-return (null);
-}
-
-}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059600 - /tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
Author: markt Date: Sun Jan 16 16:17:00 2011 New Revision: 1059600 URL: http://svn.apache.org/viewvc?rev=1059600&view=rev Log: Add a new filter for fixes that require an API breaking change that need to wait until post 7.0.x Added: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (with props) Added: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml?rev=1059600&view=auto == --- tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (added) +++ tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml Sun Jan 16 16:17:00 2011 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Propchange: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059614 - in /tomcat/trunk: java/org/apache/catalina/deploy/ java/org/apache/jasper/servlet/ java/org/apache/tomcat/util/bcel/classfile/ res/findbugs/
Author: markt
Date: Sun Jan 16 16:50:25 2011
New Revision: 1059614
URL: http://svn.apache.org/viewvc?rev=1059614&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java Sun Jan 16
16:50:25 2011
@@ -18,11 +18,15 @@
package org.apache.catalina.deploy;
+import java.io.Serializable;
+
/**
* Representation of a the multipart configuration for a servlet.
*/
-public class MultipartDef {
+public class MultipartDef implements Serializable {
+
+private static final long serialVersionUID = 1L;
// - Properties
private String location;
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Sun Jan 16
16:50:25 2011
@@ -65,12 +65,12 @@ public class JspServlet extends HttpServ
private static final long serialVersionUID = 1L;
// Logger
-private final Log log = LogFactory.getLog(JspServlet.class);
+private final transient Log log = LogFactory.getLog(JspServlet.class);
-private ServletContext context;
+private transient ServletContext context;
private ServletConfig config;
-private Options options;
-private JspRuntimeContext rctxt;
+private transient Options options;
+private transient JspRuntimeContext rctxt;
//jspFile for a jsp configured explicitly as a servlet, in environments
where this configuration is
//translated into an init-param for this servlet.
private String jspFile;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
Sun Jan 16 16:50:25 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.io.Serializable;
/**
* This class represents a stack map entry recording the types of
@@ -31,7 +32,9 @@ import java.io.IOException;
* @see StackMap
* @see StackMapType
*/
-public final class StackMapEntry implements Cloneable {
+public final class StackMapEntry implements Cloneable, Serializable {
+
+private static final long serialVersionUID = 1L;
private int byte_code_offset;
private int number_of_locals;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
Sun Jan 16 16:50:25 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
@@ -33,7 +34,9 @@ import org.apache.tomcat.util.bcel.Const
* @see StackMap
* @see StackMapType
*/
-public final class StackMapTableEntry implements Cloneable {
+public final class StackMapTableEntry implements Cloneable, Serializable {
+
+private static final long serialVersionUID = 1L;
private int frame_type;
private int byte_code_offset_delta;
Modified:
tomcat/trunk/java/org/apache/t
DO NOT REPLY [Bug 50597] New: Class.newInstance is used for Dynamic instance filters causing InstantiationException
https://issues.apache.org/bugzilla/show_bug.cgi?id=50597 Summary: Class.newInstance is used for Dynamic instance filters causing InstantiationException Product: Tomcat 7 Version: 7.0.6 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mli...@juma.me.uk Class.newInstance is called even when the following method ServletContext.addFilter method is called: javax.servlet.FilterRegistration.Dynamic addFilter(java.lang.String s, javax.servlet.Filter filter); This leads to an InstantiationException at runtime if there is no no-args constructor for the filter (pasted below). I'll supply a simple patch that fixes the issue for me. SEVERE: Exception starting filter testFilter java.lang.InstantiationException: test.TestFilter at java.lang.Class.newInstance0(Class.java:340) at java.lang.Class.newInstance(Class.java:308) at org.apache.catalina.core.DefaultInstanceManager.newInstance(DefaultIn stanceManager.java:119) at org.apache.catalina.core.ApplicationFilterConfig.getFilter(Applicatio nFilterConfig.java:252) at org.apache.catalina.core.ApplicationFilterConfig.setFilterDef(Applica tionFilterConfig.java:372) at org.apache.catalina.core.ApplicationFilterConfig.(ApplicationFi lterConfig.java:98) at org.apache.catalina.core.StandardContext.filterStart(StandardContext. java:4382) at org.apache.catalina.core.StandardContext$2.call(StandardContext.java: 5040) at org.apache.catalina.core.StandardContext$2.call(StandardContext.java:5035) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:662) -- 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 50597] Class.newInstance is used for Dynamic instance filters causing InstantiationException
https://issues.apache.org/bugzilla/show_bug.cgi?id=50597
--- Comment #1 from Ismael Juma 2011-01-16 12:27:26 EST ---
The simple patch that fixes it for me is:
[ijuma@localhost]~/src/tomcat% svn diff
Index: java/org/apache/catalina/core/ApplicationFilterConfig.java
===
--- java/org/apache/catalina/core/ApplicationFilterConfig.java(revision
1059421)
+++ java/org/apache/catalina/core/ApplicationFilterConfig.java(working
copy)
@@ -367,10 +367,10 @@
this.filter = null;
} else {
-
-// Allocate a new filter instance
-getFilter();
-
+if (filterDef.getFilter() == null) {
+ // Allocate a new filter instance
+ getFilter();
+}
}
}
I don't know if this is the best way, but it works because after returning from
that method the following is executed in the constructor (which is the same
that getFilter does for the case where Tomcat has the class but not the
instance of Filter):
if (filterDef.getFilter() != null) {
this.filter = filterDef.getFilter();
getInstanceManager().newInstance(filter);
initFilter();
}
--
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 50598] New: Sample build.xml uses wrong manager.url
https://issues.apache.org/bugzilla/show_bug.cgi?id=50598 Summary: Sample build.xml uses wrong manager.url Product: Tomcat 7 Version: unspecified Platform: PC Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: aivar.anna...@gmail.com In http://tomcat.apache.org/tomcat-7.0-doc/appdev/build.xml.txt , referenced from http://tomcat.apache.org/tomcat-7.0-doc/appdev/processes.html sample manager.url is given as "http://localhost:8080/manager"; but should be "http://localhost:8080/manager/text"; -- 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 50599] New: Documentation gives impression that "manager" role enables using ant deploy
https://issues.apache.org/bugzilla/show_bug.cgi?id=50599 Summary: Documentation gives impression that "manager" role enables using ant deploy Product: Tomcat 7 Version: unspecified Platform: PC Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: aivar.anna...@gmail.com http://tomcat.apache.org/tomcat-7.0-doc/appdev/processes.html says that "manager" role is necessary to use ant deploy task, but seems that it should be actually "manager-script". -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [taglibs] Move to pre-req Java 1.6 for Locale services?
As an alternative - can we implement this such that it uses this in Java6 and falls back to the old bad code in 1.5 and before? On Tue, Jan 11, 2011 at 1:43 AM, Henri Yandell wrote: > +1, Java 1.5 is EOL as you say. > > While Oracle are in the business of supporting the old versions when > it gets painful, we're not. > > Hen > > On Sun, Jan 2, 2011 at 3:27 PM, Jeremy Boynes wrote: >> In Java6 support was added for LocaleServiceProviders that extend the >> Locales supported by the java.text formatters. This causes #46052 as >> getAvailableLocales() now needs to scan the entire classpath rather than >> just return the Locales built in to the JRE. It also means we cannot >> continue to cache the returned set of Locales if the taglib is shared >> between different applications (for example, in a JavaEE6 environment where >> the taglibs are supplied by the container) as it will now vary with context >> ClassLoader. >> >> The java.text getInstance() methods work around this by not scanning the >> classpath if a match is found with one of the built-in providers. We can use >> this method directly if the context only requires a single Locale (either >> because we are using application-specified Locales, or because the request >> only specified a single one, or because multiple ones in the request match >> the resolution order (e.g. Firefox's "en-us,en"). >> >> However, where a request specifies multiple Locales with different prefixes, >> we still need to perform the matching ourselves as the JRE will *always* >> match something (at least the ROOT Locale) but we cannot tell which. If we >> stick to using the 1.5 level API we will trigger the uncacheable classpath >> scan on 1.6 level VMs; however, 1.6 provides the >> ServiceLoader#loadInstalled() API which can be used to determine the locales >> installed in the JRE and hence avoid the application classpath scan for JRE >> supplied locales (which are likely to be the most commonly used). >> >> As most users are likely to be running on 1.6 and we've not actually >> released a version needing 1.5 and Sun's 1.5 is generally end-of-lifed, I'd >> like to propose solving this with the 1.6 APIs and making it a >> pre-requisite. Any issue with this? >> >> Cheers >> Jeremy >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059655 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/WebRuleSet.java res/fi
Author: markt
Date: Sun Jan 16 20:33:40 2011
New Revision: 1059655
URL: http://svn.apache.org/viewvc?rev=1059655&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1059655&r1=1059654&r2=1059655&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sun Jan 16
20:33:40 2011
@@ -491,7 +491,9 @@ public class Catalina {
inputStream = new FileInputStream(file);
inputSource = new InputSource("file://" + file.getAbsolutePath());
} catch (Exception e) {
-// Ignore
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("catalina.configFail", file), e);
+}
}
if (inputStream == null) {
try {
@@ -501,7 +503,10 @@ public class Catalina {
(getClass().getClassLoader()
.getResource(getConfigFile()).toString());
} catch (Exception e) {
-// Ignore
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("catalina.configFail",
+getConfigFile()), e);
+}
}
}
@@ -510,20 +515,29 @@ public class Catalina {
if( inputStream==null ) {
try {
inputStream = getClass().getClassLoader()
-.getResourceAsStream("server-embed.xml");
+.getResourceAsStream("server-embed.xml");
inputSource = new InputSource
(getClass().getClassLoader()
.getResource("server-embed.xml").toString());
} catch (Exception e) {
-// Ignore
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("catalina.configFail",
+"server-embed.xml"), e);
+}
}
}
-if ((inputStream == null) && (file != null)) {
-log.warn("Can't load server.xml from " + file.getAbsolutePath());
-if (file.exists() && !file.canRead()) {
-log.warn("Permissions incorrect, read permission is not
allowed on the file.");
+if (inputStream == null || inputSource == null) {
+if (file == null) {
+log.warn(sm.getString("catalina.configFail",
+getConfigFile() + "] or [server-embed.xml]"));
+} else {
+log.warn(sm.getString("catalina.configFail",
+file.getAbsolutePath()));
+if (file.exists() && !file.canRead()) {
+log.warn("Permissions incorrect, read permission is not
allowed on the file.");
+}
}
return;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1059655&r1=1059654&r2=1059655&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Sun
Jan 16 20:33:40 2011
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+catalina.configFail=Unable to load server configuration from [{0}]
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1059655&r1=1059654&r2=1059655&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Sun Jan 16
20:33:40 2011
@@ -909,6 +909,7 @@ final class CallMethodMultiRule extends
if (paramCount > 0) {
parameters = (Object[]) digester.popParams();
} else {
+parameters = new Object[0];
super.end(namespace, n
svn commit: r1059660 - in /tomcat/trunk: java/org/apache/catalina/startup/ClassLoaderFactory.java res/findbugs/filter-post-7.0.x-fixes.xml
Author: markt
Date: Sun Jan 16 20:51:32 2011
New Revision: 1059660
URL: http://svn.apache.org/viewvc?rev=1059660&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1059660&r1=1059659&r2=1059660&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Sun
Jan 16 20:51:32 2011
@@ -21,6 +21,8 @@ package org.apache.catalina.startup;
import java.io.File;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
@@ -54,10 +56,10 @@ public final class ClassLoaderFactory {
private static final Log log = LogFactory.getLog(ClassLoaderFactory.class);
-protected static final Integer IS_DIR = new Integer(0);
-protected static final Integer IS_JAR = new Integer(1);
-protected static final Integer IS_GLOB = new Integer(2);
-protected static final Integer IS_URL = new Integer(3);
+protected static final Integer IS_DIR = Integer.valueOf(0);
+protected static final Integer IS_JAR = Integer.valueOf(1);
+protected static final Integer IS_GLOB = Integer.valueOf(2);
+protected static final Integer IS_URL = Integer.valueOf(3);
// - Public Methods
@@ -79,7 +81,7 @@ public final class ClassLoaderFactory {
*/
public static ClassLoader createClassLoader(File unpacked[],
File packed[],
-ClassLoader parent)
+final ClassLoader parent)
throws Exception {
if (log.isDebugEnabled())
@@ -124,14 +126,17 @@ public final class ClassLoaderFactory {
}
// Construct the class loader itself
-URL[] array = set.toArray(new URL[set.size()]);
-StandardClassLoader classLoader = null;
-if (parent == null)
-classLoader = new StandardClassLoader(array);
-else
-classLoader = new StandardClassLoader(array, parent);
-return (classLoader);
-
+final URL[] array = set.toArray(new URL[set.size()]);
+return AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public StandardClassLoader run() {
+if (parent == null)
+return new StandardClassLoader(array);
+else
+return new StandardClassLoader(array, parent);
+}
+});
}
@@ -152,7 +157,7 @@ public final class ClassLoaderFactory {
*/
public static ClassLoader createClassLoader(String locations[],
Integer types[],
-ClassLoader parent)
+final ClassLoader parent)
throws Exception {
if (log.isDebugEnabled())
@@ -216,18 +221,22 @@ public final class ClassLoaderFactory {
}
// Construct the class loader itself
-URL[] array = set.toArray(new URL[set.size()]);
+final URL[] array = set.toArray(new URL[set.size()]);
if (log.isDebugEnabled())
for (int i = 0; i < array.length; i++) {
log.debug(" location " + i + " is " + array[i]);
}
-StandardClassLoader classLoader = null;
-if (parent == null)
-classLoader = new StandardClassLoader(array);
-else
-classLoader = new StandardClassLoader(array, parent);
-return (classLoader);
+return AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public StandardClassLoader run() {
+if (parent == null)
+return new StandardClassLoader(array);
+else
+return new StandardClassLoader(array, parent);
+}
+});
}
Modified: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml?rev=1059660&r1=1059659&r2=1059660&view=diff
==
--- tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (or
svn commit: r1059671 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java res/findbugs/filter-false-positives.xml
Author: markt
Date: Sun Jan 16 21:06:31 2011
New Revision: 1059671
URL: http://svn.apache.org/viewvc?rev=1059671&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1059671&r1=1059670&r2=1059671&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Jan 16
21:06:31 2011
@@ -1435,7 +1435,7 @@ public class AprEndpoint extends Abstrac
if (rv == Status.APR_SUCCESS) {
sendfileCount--;
}
-sendfileData.remove(new Long(data.socket));
+sendfileData.remove(Long.valueOf(data.socket));
}
/**
@@ -1488,7 +1488,7 @@ public class AprEndpoint extends Abstrac
SendfileData data = addS.get(i);
int rv = Poll.add(sendfilePollset,
data.socket, Poll.APR_POLLOUT);
if (rv == Status.APR_SUCCESS) {
-sendfileData.put(new
Long(data.socket), data);
+
sendfileData.put(Long.valueOf(data.socket), data);
successCount++;
} else {
log.warn(sm.getString("endpoint.sendfile.addfail", "" + rv,
Error.strerror(rv)));
@@ -1511,7 +1511,7 @@ public class AprEndpoint extends Abstrac
for (int n = 0; n < rv; n++) {
// Get the sendfile state
SendfileData state =
-sendfileData.get(new Long(desc[n*2+1]));
+sendfileData.get(Long.valueOf(desc[n*2+1]));
// Problem events
if (((desc[n*2] & Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
|| ((desc[n*2] & Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
@@ -1575,7 +1575,7 @@ public class AprEndpoint extends Abstrac
if (rv > 0) {
for (int n = 0; n < rv; n++) {
// Get the sendfile state
-SendfileData state = sendfileData.get(new
Long(desc[n]));
+SendfileData state =
sendfileData.get(Long.valueOf(desc[n]));
// Close socket and clear pool
remove(state);
// Destroy file descriptor pool, which should
close the file
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059671&r1=1059670&r2=1059671&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Jan 16 21:06:31
2011
@@ -99,6 +99,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1059683 - /tomcat/trunk/build.xml
Author: markt Date: Sun Jan 16 21:30:42 2011 New Revision: 1059683 URL: http://svn.apache.org/viewvc?rev=1059683&view=rev Log: New classes need to be in bootstrap.jar Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1059683&r1=1059682&r2=1059683&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sun Jan 16 21:30:42 2011 @@ -259,6 +259,8 @@ + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 20405] "Unterminated tag"-error: say which one
https://issues.apache.org/bugzilla/show_bug.cgi?id=20405 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2011-01-16 16:33:26 EST --- This was fixed at some point in the past. I haven't done the code archaeology to determine exactly when. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [taglibs] Move to pre-req Java 1.6 for Locale services?
It's not really bad code in 1.5 - 1.6 added the ability to dynamically support Locales with the consequence of needing to scan the classpath for services when the locale is not provided by the VM. It works fine when there's only a single Locale involved but falls short when you're trying to best-match one of a set of Locales as there's no way to determine if fallback has occurred (like you can with ResourceBundle#getLocale()). Supporting both JVMs can be done - it's just more work refactoring things out from being built into the tag implementations. Another alternative would be to use Joda instead of the JVM date/time formatters. That would also avoid the synchronization issues as Joda is thread safe; the downside is that it's an external dependency. And we would still need a solution for numbers. On Jan 16, 2011, at 11:33 AM, Henri Yandell wrote: > As an alternative - can we implement this such that it uses this in > Java6 and falls back to the old bad code in 1.5 and before? > > On Tue, Jan 11, 2011 at 1:43 AM, Henri Yandell wrote: >> +1, Java 1.5 is EOL as you say. >> >> While Oracle are in the business of supporting the old versions when >> it gets painful, we're not. >> >> Hen >> >> On Sun, Jan 2, 2011 at 3:27 PM, Jeremy Boynes wrote: >>> In Java6 support was added for LocaleServiceProviders that extend the >>> Locales supported by the java.text formatters. This causes #46052 as >>> getAvailableLocales() now needs to scan the entire classpath rather than >>> just return the Locales built in to the JRE. It also means we cannot >>> continue to cache the returned set of Locales if the taglib is shared >>> between different applications (for example, in a JavaEE6 environment where >>> the taglibs are supplied by the container) as it will now vary with context >>> ClassLoader. >>> >>> The java.text getInstance() methods work around this by not scanning the >>> classpath if a match is found with one of the built-in providers. We can >>> use this method directly if the context only requires a single Locale >>> (either because we are using application-specified Locales, or because the >>> request only specified a single one, or because multiple ones in the >>> request match the resolution order (e.g. Firefox's "en-us,en"). >>> >>> However, where a request specifies multiple Locales with different >>> prefixes, we still need to perform the matching ourselves as the JRE will >>> *always* match something (at least the ROOT Locale) but we cannot tell >>> which. If we stick to using the 1.5 level API we will trigger the >>> uncacheable classpath scan on 1.6 level VMs; however, 1.6 provides the >>> ServiceLoader#loadInstalled() API which can be used to determine the >>> locales installed in the JRE and hence avoid the application classpath scan >>> for JRE supplied locales (which are likely to be the most commonly used). >>> >>> As most users are likely to be running on 1.6 and we've not actually >>> released a version needing 1.5 and Sun's 1.5 is generally end-of-lifed, I'd >>> like to propose solving this with the 1.6 APIs and making it a >>> pre-requisite. Any issue with this? >>> >>> Cheers >>> Jeremy >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >>> >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 21220] java.util.zip.ZipException on Tomcat boot is less than helpful
https://issues.apache.org/bugzilla/show_bug.cgi?id=21220 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #2 from Mark Thomas 2011-01-16 16:53:00 EST --- This was addressed for 5.5.x onwards in r345264. See the commit comment for the explanation of the approach. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [taglibs] Move to pre-req Java 1.6 for Locale services?
*nod*. Why don't we go ahead and release and leave this for a bugfix/minor release afterwards? If we choose to move to JDK 1.6; there will be a 1.5 available for use that can be branched for serious bugfixes. If we choose to implement both, we can but it won't hold up any release. It also gives us something to do after the release so we can move to a release-often mantra. Hen On Sun, Jan 16, 2011 at 1:38 PM, Jeremy Boynes wrote: > It's not really bad code in 1.5 - 1.6 added the ability to dynamically > support Locales with the consequence of needing to scan the classpath for > services when the locale is not provided by the VM. It works fine when > there's only a single Locale involved but falls short when you're trying to > best-match one of a set of Locales as there's no way to determine if fallback > has occurred (like you can with ResourceBundle#getLocale()). > > Supporting both JVMs can be done - it's just more work refactoring things out > from being built into the tag implementations. > > Another alternative would be to use Joda instead of the JVM date/time > formatters. That would also avoid the synchronization issues as Joda is > thread safe; the downside is that it's an external dependency. And we would > still need a solution for numbers. > > On Jan 16, 2011, at 11:33 AM, Henri Yandell wrote: > >> As an alternative - can we implement this such that it uses this in >> Java6 and falls back to the old bad code in 1.5 and before? >> >> On Tue, Jan 11, 2011 at 1:43 AM, Henri Yandell wrote: >>> +1, Java 1.5 is EOL as you say. >>> >>> While Oracle are in the business of supporting the old versions when >>> it gets painful, we're not. >>> >>> Hen >>> >>> On Sun, Jan 2, 2011 at 3:27 PM, Jeremy Boynes wrote: In Java6 support was added for LocaleServiceProviders that extend the Locales supported by the java.text formatters. This causes #46052 as getAvailableLocales() now needs to scan the entire classpath rather than just return the Locales built in to the JRE. It also means we cannot continue to cache the returned set of Locales if the taglib is shared between different applications (for example, in a JavaEE6 environment where the taglibs are supplied by the container) as it will now vary with context ClassLoader. The java.text getInstance() methods work around this by not scanning the classpath if a match is found with one of the built-in providers. We can use this method directly if the context only requires a single Locale (either because we are using application-specified Locales, or because the request only specified a single one, or because multiple ones in the request match the resolution order (e.g. Firefox's "en-us,en"). However, where a request specifies multiple Locales with different prefixes, we still need to perform the matching ourselves as the JRE will *always* match something (at least the ROOT Locale) but we cannot tell which. If we stick to using the 1.5 level API we will trigger the uncacheable classpath scan on 1.6 level VMs; however, 1.6 provides the ServiceLoader#loadInstalled() API which can be used to determine the locales installed in the JRE and hence avoid the application classpath scan for JRE supplied locales (which are likely to be the most commonly used). As most users are likely to be running on 1.6 and we've not actually released a version needing 1.5 and Sun's 1.5 is generally end-of-lifed, I'd like to propose solving this with the 1.6 APIs and making it a pre-requisite. Any issue with this? Cheers Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
