date:20160915

Re: Webinars

2016-09-15 Thread Mark Thomas

On 15 September 2016 17:37:38 BST, Christopher Schultz 
 wrote:
>Mark,
>
>On 9/15/16 7:39 AM, Mark Thomas wrote:
>> We haven't had any webinars for a while.
>> 
>> Looking at the YouTube stats for the recordings we have had 5k+ views
>> across 5 webinars which in reality means more like 2.5k people
>watching
>> one for more than a few seconds and around 1k watching one to the
>end.
>> 
>> My view of those numbers is that the webinars are worth while and we
>> should try to do some more. The current ideas for future topics are
>> listed at [1]. Does anyone fancy presenting on one of those?
>Additional
>> topic suggestions welcome as well.
>
>I could do one or two.

Great.  What sort of dates/ times work for you? I'm happy to stay up fairly 
late to run it.

> Would Pivotal be willing to donate the Webex
>connectivity and recording for that?

Sure.

> I don't know how much
>post-processing you have done for previous webinar recordings, but I
>could conceivably do that myself if you have some suggestions for what
>to do -- other than of course removing all the lead time waiting for a
>few more people to connect, etc.

Very little. Mostly just format conversion which is more waiting than anything 
else. I'm happy to do that but I should write up the process somewhere.

>We might want to ask again on the users' list to see if anyone wants to
>add to the queue of topic.

Good idea. Go for it.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Webinars

2016-09-15 Thread Christopher Schultz

Mark,

On 9/15/16 7:39 AM, Mark Thomas wrote:
> We haven't had any webinars for a while.
> 
> Looking at the YouTube stats for the recordings we have had 5k+ views
> across 5 webinars which in reality means more like 2.5k people watching
> one for more than a few seconds and around 1k watching one to the end.
> 
> My view of those numbers is that the webinars are worth while and we
> should try to do some more. The current ideas for future topics are
> listed at [1]. Does anyone fancy presenting on one of those? Additional
> topic suggestions welcome as well.

I could do one or two. Would Pivotal be willing to donate the Webex
connectivity and recording for that? I don't know how much
post-processing you have done for previous webinar recordings, but I
could conceivably do that myself if you have some suggestions for what
to do -- other than of course removing all the lead time waiting for a
few more people to connect, etc.

We might want to ask again on the users' list to see if anyone wants to
add to the queue of topics.

Thanks,
-chris

signature.asc
Description: OpenPGP digital signature

Re: Auto-update of Tomcat web site?

2016-09-15 Thread Christopher Schultz

Violeta,

On 9/15/16 11:00 AM, Violeta Georgieva wrote:
> Hi Chris,
> 
> 2016-09-15 17:51 GMT+03:00 Christopher Schultz > :
>>
>> All,
>>
>> I committed a change to xdocs/presentations.xml and
>> docs/presentations.html (and then markt made some additional changes),
>> and the README suggests that those updates will auto-propagate to the
>> public web site.
>>
>> I'm not seeing the changes, yet, and it's been about 15 hours. Am I just
>> being too anxious about the schedule, or is there another process I need
>> to kick-off?
> 
> I can see them. Is it possible there is some caching on your side?

It must have been. A three-finger-reload on my end got me the content I
was expecting.

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature

Re: Should we update version scheme information for tomcat 9?

2016-09-15 Thread Mark Thomas

On 15 September 2016 16:32:36 BST, Coty Sutherland  wrote:
>Hi all,
>
>I'm getting quite a few questions on freenode in #tomcat about the
>versioning scheme for tomcat 9. I looked at the
>http://tomcat.apache.org/whichversion.html page and it has some good
>information there, but it doesn't mention what the milestone releases
>are or how they fit into the alpha/beta/stable releases. Can we add
>some information there to help users better understand the milestone
>releases (if that is going to continue to be a thing) and how they fit
>into the lifecycle?
>
>I can open a bug for it, but wanted to get an opinion on whether or
>not this is something that we want to do.
>
>
>
>Thanks,
>Coty
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org

+1

Current plan is milestones until the specs are final. Depending on what happens 
with JavaEE 7 we might need to rethink that. We should know more after Java One.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Auto-update of Tomcat web site?

2016-09-15 Thread Mark Thomas

On 15 September 2016 15:51:51 BST, Christopher Schultz 
 wrote:
>All,
>
>I committed a change to xdocs/presentations.xml and
>docs/presentations.html (and then markt made some additional changes),
>and the README suggests that those updates will auto-propagate to the
>public web site.
>
>I'm not seeing the changes, yet, and it's been about 15 hours. Am I
>just
>being too anxious about the schedule, or is there another process I
>need
>to kick-off?
>
>Thanks,
>-chris

I see the changes. They typically appear in the time it takes for an svn up. 
Usually just a few seconds.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Should we update version scheme information for tomcat 9?

2016-09-15 Thread Coty Sutherland

Hi all,

I'm getting quite a few questions on freenode in #tomcat about the
versioning scheme for tomcat 9. I looked at the
http://tomcat.apache.org/whichversion.html page and it has some good
information there, but it doesn't mention what the milestone releases
are or how they fit into the alpha/beta/stable releases. Can we add
some information there to help users better understand the milestone
releases (if that is going to continue to be a thing) and how they fit
into the lifecycle?

I can open a bug for it, but wanted to get an opinion on whether or
not this is something that we want to do.



Thanks,
Coty

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Auto-update of Tomcat web site?

2016-09-15 Thread Violeta Georgieva

Hi Chris,

2016-09-15 17:51 GMT+03:00 Christopher Schultz :
>
> All,
>
> I committed a change to xdocs/presentations.xml and
> docs/presentations.html (and then markt made some additional changes),
> and the README suggests that those updates will auto-propagate to the
> public web site.
>
> I'm not seeing the changes, yet, and it's been about 15 hours. Am I just
> being too anxious about the schedule, or is there another process I need
> to kick-off?

I can see them. Is it possible there is some caching on your side?

Regards,
Violeta

> Thanks,
> -chris
>

Auto-update of Tomcat web site?

2016-09-15 Thread Christopher Schultz

All,

I committed a change to xdocs/presentations.xml and
docs/presentations.html (and then markt made some additional changes),
and the README suggests that those updates will auto-propagate to the
public web site.

I'm not seeing the changes, yet, and it's been about 15 hours. Am I just
being too anxious about the schedule, or is there another process I need
to kick-off?

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature

[Bug 58608] Issue with IIS7+ buffered response

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=58608

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED
 OS||All

--- Comment #1 from Mark Thomas  ---
This has been fixed in trunk for 1.2.42 onwards with a new option called
"flush_packets".

-- 
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: r1760936 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml xdocs/reference/iis.xml

2016-09-15 Thread markt

Author: markt
Date: Thu Sep 15 14:12:19 2016
New Revision: 1760936

URL: http://svn.apache.org/viewvc?rev=1760936=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58608
Add a new option for IIS called "flush_packets" that enables control of the 
buffering added in IIS7+

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/iis.xml

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1760936=1760935=1760936=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Thu Sep 15 14:12:19 2016
@@ -51,6 +51,10 @@
 #define POSIX_MALLOC_THRESHOLD 10
 #endif
 
+#ifndef HSE_REQ_SET_FLUSH_FLAG
+#define HSE_REQ_SET_FLUSH_FLAG (HSE_REQ_END_RESERVED + 43)
+#endif
+
 #include 
 
 #define VERSION_STRING "Tomcat/ISAPI/" JK_EXPOSED_VERSION
@@ -135,6 +139,7 @@ static char HTTP_WORKER_HEADER_INDEX[RES
 #define WATCHDOG_INTERVAL_TAG "watchdog_interval"
 #define ENABLE_CHUNKED_ENCODING_TAG   "enable_chunked_encoding"
 #define ERROR_PAGE_TAG"error_page"
+#define FLUSH_PACKETS_TAG "flush_packets"
 
 #define LOG_ROTATION_TIME_TAG "log_rotationtime"
 #define LOG_FILESIZE_TAG  "log_filesize"
@@ -510,6 +515,7 @@ static volatile int  watchdog_interval =
 static HANDLE watchdog_handle = NULL;
 static char error_page_buf[INTERNET_MAX_URL_LENGTH] = {0};
 static char *error_page = NULL;
+static int flush_packets = JK_FALSE;
 
 #define URI_SELECT_OPT_PARSED   0
 #define URI_SELECT_OPT_UNPARSED 1
@@ -2183,6 +2189,11 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 s.ws_private = _data;
 s.pool = _data.p;
 
+if (flush_packets) {
+lpEcb->ServerSupportFunction(lpEcb->ConnID, HSE_REQ_SET_FLUSH_FLAG,
+(LPVOID) TRUE, NULL, NULL);
+}
+
 if (init_ws_service(_data, , _name)) {
 jk_endpoint_t *e = NULL;
 jk_worker_t *worker = wc_get_worker_for_name(worker_name, logger);
@@ -2964,6 +2975,7 @@ static int read_registry_init_data(void)
 if (watchdog_interval < 0)
 watchdog_interval = 0;
 chunked_encoding_enabled = get_config_bool(src, 
ENABLE_CHUNKED_ENCODING_TAG, JK_FALSE);
+flush_packets = get_config_bool(src, FLUSH_PACKETS_TAG, JK_FALSE);
 if (get_config_parameter(src, ERROR_PAGE_TAG, error_page_buf, 
sizeof(error_page_buf))) {
 error_page = error_page_buf;
 }

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1760936=1760935=1760936=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Sep 15 14:12:19 2016
@@ -75,6 +75,12 @@
 (rjung)
   
   
+58608: ISAPI: Add a new registry option "flush_packets"
+that allows the flushing behaviour of IIS7+ to be controlled. The
+default is not to flush. Setting the option to "true" with cause IIS to
+write data to the client as each AJP packet is received. (markt)
+  
+  
 58813: ISAPI: Correctly release a mutex allowing the plugin
 to complete initialization. Prior to this fix, the incomplete
 initialization was causing a hang on shutdown. Patch provided by 
Matthew

Modified: tomcat/jk/trunk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/iis.xml?rev=1760936=1760935=1760936=diff
==
--- tomcat/jk/trunk/xdocs/reference/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/iis.xml Thu Sep 15 14:12:19 2016
@@ -269,6 +269,16 @@ was considered experimental and only ava
 chunking support was used. Starting with 1.2.30 it is no longer considered
 experimental.
 
+
+A string value representing a boolean. If it is set to true,
+data is flushed immediately to the client as each AJP packet is received.
+Otherwise, IIS buffers the data and only writes to the client when the buffer
+is full or the response is complete.
+
+The default value is false.
+
+This directive has been added in version 1.2.42
+
 
  
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Deploying Tomcat on Snappy Ubuntu Core

2016-09-15 Thread Michael Hall

Hi Coty,

To learn more about snaps in general and how to make them you can go to
http://snapcraft.io/

The tl;dr is that they are self-contained application bundles, including
dependencies, that are packed into a squashfs that is then loop-mounted
when installed. This means that the application's own files are
read-only and isolated from other apps and the system, which makes
updating them safe and simple. For Tomcat this means it includes a JRE,
OpenSSL, and anything else needed for Tomcat to run.

I have attached the files needed to build a Tomcat snap using the the
Snapcraft tool (only available on Ubuntu currently), just run "snapcraft
snap" in the same directory as these files. The snapcrafy.yaml will pull
Tomcat 8.5.5 binary tarball as it's source, so no re-compiling is
needed. The run.sh simply sets some environment variables to their
proper snap-environment locations, copies the server.xml into
CATALINE_BASE (if it's not there), and starts Tomcat.

Because the snapcraft.yaml declares this to be a daemon, it will create
a systemd service file upon installation and start it automatically.
Then you can copy a .war files into $CATALINA_BASE/webapps/ and Tomcat
will pick it up. I tested with the sample.war from
https://tomcat.apache.org/tomcat-8.0-doc/appdev/sample/ and it works
with the servlet portion, but not the JSP (I suspect the JSP compilation
is trying write to use a read-only space, but haven't dug too far into it).

If you don't run Ubuntu the easiest way to build the snap is in a VM or
container that has Ubuntu 16.04, just install the snapcraft package from
the archive. If you just want to try a pre-built binary, you can
download mine from http://people.ubuntu.com/~mhall119/snaps/

You can install it on Ubuntu 16.04 or a derivative right away with "snap
install $snapfile --force-dangerous". The --force-dangerous is required
because the resulting snap won't be signed. On non-Ubuntu distros you
can get snaps running by following the instructions on
http://snapcraft.io/docs/core/install

Michael Hall
mhall...@ubuntu.com

On 09/14/2016 11:23 PM, Coty Sutherland wrote:
> Hi Micheal,
> 
> I hadn't heard of snaps (or used Ubuntu much) but the concept seems
> interesting to me. Would you be able to send me links to what you have
> so far so I can check it out? I have a few questions, but I'll reserve
> those until I get a chance to review what you have.
> 
> Thanks!
> 
> 
> On Sep 14, 2016 3:51 PM, "Michael Hall"  > wrote:
> 
> Hi everyone,
> 
> Ubuntu has developed a new platform for deploying applications using
> bundled packages called "snaps". These make it easier to deploy and
> update on Ubuntu independently of it's release cycle (and on non-Ubuntu
> distros too for that matter). I would like to make Tomcat available in
> this format so it can be more easily used on lightweight cloud instances
> or devices like the Raspberry Pi.
> 
> I have a working example of Tomcat as a snap, and it works really well
> with a separate read-only CATALINE_HOME and a writable, versioned
> CATALINA_BASE that will allow for atomic updates and rollbacks without
> breaking application data, and it's very easy to use.
> 
> The next step is to contribute this to upstream, where it can be
> improved (I've only scratched the surface of what can be done with it)
> and integrated with the CI system so that snap package can be
> automatically created and uploaded for testers and users. This is where
> I need help from somebody on this list, so please let me know if you are
> interested and I will provide you the packaging files (there are only 2)
> and a working binary package if you want to give it a try.
> 
> Thanks.
> 
> --
> Michael Hall
> mhall...@ubuntu.com 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 

snapcraft.yaml
Description: application/yaml

run.sh
Description: application/shellscript

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760924 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-15 Thread markt

Author: markt
Date: Thu Sep 15 12:53:13 2016
New Revision: 1760924

URL: http://svn.apache.org/viewvc?rev=1760924=rev
Log:
whitespace police

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760924=1760923=1760924=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 12:53:13 2016
@@ -296,7 +296,7 @@ public class StatementCache extends Stat
 }
 return key;
 }
-
+
 
 private static final class CacheKey {
 private final String stmtType;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Webinars

2016-09-15 Thread Mark Thomas

We haven't had any webinars for a while.

Looking at the YouTube stats for the recordings we have had 5k+ views
across 5 webinars which in reality means more like 2.5k people watching
one for more than a few seconds and around 1k watching one to the end.

My view of those numbers is that the webinars are worth while and we
should try to do some more. The current ideas for future topics are
listed at [1]. Does anyone fancy presenting on one of those? Additional
topic suggestions welcome as well.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760919 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

2016-09-15 Thread markt

Author: markt
Date: Thu Sep 15 11:31:17 2016
New Revision: 1760919

URL: http://svn.apache.org/viewvc?rev=1760919=rev
Log:
Add the link to the video for the Tomcat 8.5 presentation I forgot to update 
after I presented it.

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1760919=1760918=1760919=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Sep 15 11:31:17 2016
@@ -225,19 +225,7 @@ presentations then please do let us know
 Scheduled presentations
 
 
-Introducing Apache Tomcat 8.5 (markt)
-
-
-  
-Webinar: Wednesday 30 March 2016
-  http://markmail.org/message/jwuxtbyvyttymjt6;>10.00 UTC
-
-  
-Webinar: Wednesday 30 March 2016
-  http://markmail.org/message/342oyjdnwwwuh6vr;>20.00 UTC
-
-
-
+To be confirmed.
 
 
 
@@ -318,6 +306,9 @@ mailing list.
 http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
 
 
+Introducing Apache Tomcat 8.5 (markt) https://www.youtube.com/watch?v=kBJCIpPLWm0;>video
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1760919=1760918=1760919=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Thu Sep 15 11:31:17 2016
@@ -16,13 +16,7 @@ presentations then please do let us know
 Tomcat Users mailing list.
 
 
-Introducing Apache Tomcat 8.5 (markt)
-
-  Webinar: Wednesday 30 March 2016
-  http://markmail.org/message/jwuxtbyvyttymjt6;>10.00 UTC
-  Webinar: Wednesday 30 March 2016
-  http://markmail.org/message/342oyjdnwwwuh6vr;>20.00 UTC
-
+To be confirmed.
 
 
 
@@ -63,6 +57,7 @@ mailing list.
 Connector selection: BIO vs NIO vs NIO2 vs APR (markt) https://www.youtube.com/watch?v=LBSWixIwMmU;>video
 TLS key/certificate generation (markt) https://www.youtube.com/watch?v=I6TbMqH9WFg;>video,
 http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
+Introducing Apache Tomcat 8.5 (markt) https://www.youtube.com/watch?v=kBJCIpPLWm0;>video
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760918 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

2016-09-15 Thread markt

Author: markt
Date: Thu Sep 15 11:28:47 2016
New Revision: 1760918

URL: http://svn.apache.org/viewvc?rev=1760918=rev
Log:
Correct title. Move more recent presentations to the top

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1760918=1760917=1760918=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Sep 15 11:28:47 2016
@@ -276,16 +276,27 @@ mailing list.
 
 
 
-Webinar Series 2016
+ApacheCon 2016
 
 
 
-
-Connector selection: BIO vs NIO vs NIO2 vs APR (markt) https://www.youtube.com/watch?v=LBSWixIwMmU;>video
+  
+
+Seamless Upgrades for Credential Security in Apache Tomcat - Christopher 
Schultz,
+http://people.apache.org/~schultz/ApacheCon%20NA%202016/Seamless%20Upgrades%20for%20Credential%20Security%20in%20Apache%20Tomcat.pdf;>slides
+  
 
-
-TLS key/certificate generation (markt) https://www.youtube.com/watch?v=I6TbMqH9WFg;>video,
-http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
+  
+
+Monitoring Apache Tomcat with JMX - Christopher Schultz,
+http://people.apache.org/~schultz/ApacheCon%20NA%202016/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf;>slides
+  
+
+  
+
+Using OpenSSL to Boost JSSE in Tomcat - Jean-Frederic Clere,
+http://schd.ws/hosted_files/apachecon2016/22/Using%20OpenSSL%20to%20Boost%20JSSE%20in%20Tomcat.pdf;>slides
+  
 
 
 
@@ -295,15 +306,16 @@ mailing list.
 
 
 
-Webinar Series 2015
+Webinar Series 2016
 
 
 
 
-Tomcat 9: HTTP/2 Quick Start (markt), https://www.youtube.com/watch?v=oCFwgMvouis;>video
+Connector selection: BIO vs NIO vs NIO2 vs APR (markt) https://www.youtube.com/watch?v=LBSWixIwMmU;>video
 
 
-TLS Virtual Hosting (markt), https://www.youtube.com/watch?v=UnEcYYutbRg;>video
+TLS key/certificate generation (markt) https://www.youtube.com/watch?v=I6TbMqH9WFg;>video,
+http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
 
 
 
@@ -313,27 +325,15 @@ mailing list.
 
 
 
-ApacheCon 2015
+Webinar Series 2015
 
 
 
-  
-
-Seamless Upgrades for Credential Security in Apache Tomcat - Christopher 
Schultz,
-http://people.apache.org/~schultz/ApacheCon%20NA%202016/Seamless%20Upgrades%20for%20Credential%20Security%20in%20Apache%20Tomcat.pdf;>slides
-  
-
-  
-
-Monitoring Apache Tomcat with JMX - Christopher Schultz,
-http://people.apache.org/~schultz/ApacheCon%20NA%202016/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf;>slides
-  
+
+Tomcat 9: HTTP/2 Quick Start (markt), https://www.youtube.com/watch?v=oCFwgMvouis;>video
 
-  
-
-Using OpenSSL to Boost JSSE in Tomcat - Jean-Frederic Clere,
-http://schd.ws/hosted_files/apachecon2016/22/Using%20OpenSSL%20to%20Boost%20JSSE%20in%20Tomcat.pdf;>slides
-  
+
+TLS Virtual Hosting (markt), https://www.youtube.com/watch?v=UnEcYYutbRg;>video
 
 
 
@@ -343,7 +343,7 @@ mailing list.
 
 
 
-ApacheCon 2015
+ApacheCon 2015
 
 
 

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1760918=1760917=1760918=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Thu Sep 15 11:28:47 2016
@@ -41,22 +41,7 @@ mailing list.
 
 
 
-
-
-Connector selection: BIO vs NIO vs NIO2 vs APR (markt) https://www.youtube.com/watch?v=LBSWixIwMmU;>video
-TLS key/certificate generation (markt) https://www.youtube.com/watch?v=I6TbMqH9WFg;>video,
-http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
-
-
-
-
-
-Tomcat 9: HTTP/2 Quick Start (markt), https://www.youtube.com/watch?v=oCFwgMvouis;>video
-TLS Virtual Hosting (markt), https://www.youtube.com/watch?v=UnEcYYutbRg;>video
-
-
-
-
+
 
   
 Seamless Upgrades for Credential Security in Apache Tomcat - Christopher 
Schultz,
@@ -73,6 +58,21 @@ mailing list.
 
 
 
+
+
+Connector selection: BIO vs NIO vs NIO2 vs APR (markt) https://www.youtube.com/watch?v=LBSWixIwMmU;>video
+TLS key/certificate generation (markt) https://www.youtube.com/watch?v=I6TbMqH9WFg;>video,
+http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt;>script
+
+
+
+
+
+Tomcat 9: HTTP/2 Quick Start (markt), https://www.youtube.com/watch?v=oCFwgMvouis;>video
+TLS Virtual Hosting (markt), https://www.youtube.com/watch?v=UnEcYYutbRg;>video
+
+
+
 
 
 Tomcat Clustering: Part 1 - Reverse Proxies (markt), slides



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands,

[Bug 60099] StatementCache does not check the scrollable type of result set when searching for a cached statement

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60099

Keiichi Fujino  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Keiichi Fujino  ---
Thanks for the report.
The fix will be in :
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.73 onwards

-- 
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: r1760913 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:17:12 2016
New Revision: 1760913

URL: http://svn.apache.org/viewvc?rev=1760913=rev
Log:
Add Deprecated.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760913=1760912=1760913=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:17:12 2016
@@ -184,6 +184,10 @@ public class StatementCache extends Stat
 }
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 9
+ */
+@Deprecated
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
 ConcurrentHashMap cache =



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760912 - /tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:16:41 2016
New Revision: 1760912

URL: http://svn.apache.org/viewvc?rev=1760912=rev
Log:
Add Deprecated.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760912=1760911=1760912=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:16:41 2016
@@ -185,6 +185,10 @@ public class StatementCache extends Stat
 }
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 9
+ */
+@Deprecated
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
 ConcurrentHashMap cache =



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760911 - /tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:16:07 2016
New Revision: 1760911

URL: http://svn.apache.org/viewvc?rev=1760911=rev
Log:
Add Deprecated.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760911=1760910=1760911=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:16:07 2016
@@ -185,6 +185,10 @@ public class StatementCache extends Stat
 }
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 9
+ */
+@Deprecated
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
 ConcurrentHashMap cache =



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760910 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:11:25 2016
New Revision: 1760910

URL: http://svn.apache.org/viewvc?rev=1760910=rev
Log:
Remove unused code

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760910=1760909=1760910=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:11:25 2016
@@ -185,13 +185,6 @@ public class StatementCache extends Stat
 }
 }
 
-public CachedStatement isCached(String sql) {
-@SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-return cache.get(sql);
-}
-
 public CachedStatement isCached(Method method, Object[] args) {
 @SuppressWarnings("unchecked")
 ConcurrentHashMap cache =



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760909 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:08:23 2016
New Revision: 1760909

URL: http://svn.apache.org/viewvc?rev=1760909=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60099
Ensure that use all method arguments as a cache key when using StatementCache.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760909=1760908=1760909=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:08:23 2016
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +121,7 @@ public class StatementCache extends Stat
 cacheSize = cacheSizeMap.get(parent);
 this.pcon = con;
 if (!pcon.getAttributes().containsKey(STATEMENT_CACHE_ATTR)) {
-ConcurrentHashMap cache = new 
ConcurrentHashMap();
+ConcurrentHashMap cache = new 
ConcurrentHashMap();
 pcon.getAttributes().put(STATEMENT_CACHE_ATTR,cache);
 }
 }
@@ -129,11 +130,11 @@ public class StatementCache extends Stat
 @Override
 public void disconnected(ConnectionPool parent, PooledConnection con, 
boolean finalizing) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap statements =
-
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap statements =
+
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
 
 if (statements!=null) {
-for (Map.Entry p : statements.entrySet()) 
{
+for (Map.Entry p : 
statements.entrySet()) {
 closeStatement(p.getValue());
 }
 statements.clear();
@@ -159,6 +160,7 @@ public class StatementCache extends Stat
 statementProxy.setActualProxy(result);
 statementProxy.setConnection(proxy);
 statementProxy.setConstructor(constructor);
+statementProxy.setCacheKey(createCacheKey(method, args));
 return result;
 } else {
 return super.createDecorator(proxy, method, args, statement, 
constructor, sql);
@@ -169,7 +171,7 @@ public class StatementCache extends Stat
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
 boolean process = process(this.types, method, false);
 if (process && args.length>0 && args[0] instanceof String) {
-CachedStatement statement = isCached((String)args[0]);
+CachedStatement statement = isCached(method, args);
 if (statement!=null) {
 //remove it from the cache since it is used
 removeStatement(statement);
@@ -184,18 +186,25 @@ public class StatementCache extends Stat
 
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
 return cache.get(sql);
 }
 
+public CachedStatement isCached(Method method, Object[] args) {
+@SuppressWarnings("unchecked")
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+return cache.get(createCacheKey(method, args));
+}
+
 public boolean cacheStatement(CachedStatement proxy) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-if (proxy.getSql()==null) {
+

svn commit: r1760908 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:07:24 2016
New Revision: 1760908

URL: http://svn.apache.org/viewvc?rev=1760908=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60099
Ensure that use all method arguments as a cache key when using StatementCache.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760908=1760907=1760908=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:07:24 2016
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +121,7 @@ public class StatementCache extends Stat
 cacheSize = cacheSizeMap.get(parent);
 this.pcon = con;
 if (!pcon.getAttributes().containsKey(STATEMENT_CACHE_ATTR)) {
-ConcurrentHashMap cache =
+ConcurrentHashMap cache =
 new ConcurrentHashMap<>();
 pcon.getAttributes().put(STATEMENT_CACHE_ATTR,cache);
 }
@@ -130,11 +131,11 @@ public class StatementCache extends Stat
 @Override
 public void disconnected(ConnectionPool parent, PooledConnection con, 
boolean finalizing) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap statements =
-
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap statements =
+
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
 
 if (statements!=null) {
-for (Map.Entry p : statements.entrySet()) 
{
+for (Map.Entry p : 
statements.entrySet()) {
 closeStatement(p.getValue());
 }
 statements.clear();
@@ -160,6 +161,7 @@ public class StatementCache extends Stat
 statementProxy.setActualProxy(result);
 statementProxy.setConnection(proxy);
 statementProxy.setConstructor(constructor);
+statementProxy.setCacheKey(createCacheKey(method, args));
 return result;
 } else {
 return super.createDecorator(proxy, method, args, statement, 
constructor, sql);
@@ -170,7 +172,7 @@ public class StatementCache extends Stat
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
 boolean process = process(this.types, method, false);
 if (process && args.length>0 && args[0] instanceof String) {
-CachedStatement statement = isCached((String)args[0]);
+CachedStatement statement = isCached(method, args);
 if (statement!=null) {
 //remove it from the cache since it is used
 removeStatement(statement);
@@ -185,18 +187,25 @@ public class StatementCache extends Stat
 
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
 return cache.get(sql);
 }
 
+public CachedStatement isCached(Method method, Object[] args) {
+@SuppressWarnings("unchecked")
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+return cache.get(createCacheKey(method, args));
+}
+
 public boolean cacheStatement(CachedStatement proxy) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-if (proxy.getSql()==null) {
+ConcurrentHashMap cache =
+

svn commit: r1760907 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:06:42 2016
New Revision: 1760907

URL: http://svn.apache.org/viewvc?rev=1760907=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60099
Ensure that use all method arguments as a cache key when using StatementCache.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760907=1760906=1760907=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:06:42 2016
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +121,7 @@ public class StatementCache extends Stat
 cacheSize = cacheSizeMap.get(parent);
 this.pcon = con;
 if (!pcon.getAttributes().containsKey(STATEMENT_CACHE_ATTR)) {
-ConcurrentHashMap cache =
+ConcurrentHashMap cache =
 new ConcurrentHashMap<>();
 pcon.getAttributes().put(STATEMENT_CACHE_ATTR,cache);
 }
@@ -130,11 +131,11 @@ public class StatementCache extends Stat
 @Override
 public void disconnected(ConnectionPool parent, PooledConnection con, 
boolean finalizing) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap statements =
-
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap statements =
+
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
 
 if (statements!=null) {
-for (Map.Entry p : statements.entrySet()) 
{
+for (Map.Entry p : 
statements.entrySet()) {
 closeStatement(p.getValue());
 }
 statements.clear();
@@ -160,6 +161,7 @@ public class StatementCache extends Stat
 statementProxy.setActualProxy(result);
 statementProxy.setConnection(proxy);
 statementProxy.setConstructor(constructor);
+statementProxy.setCacheKey(createCacheKey(method, args));
 return result;
 } else {
 return super.createDecorator(proxy, method, args, statement, 
constructor, sql);
@@ -170,7 +172,7 @@ public class StatementCache extends Stat
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
 boolean process = process(this.types, method, false);
 if (process && args.length>0 && args[0] instanceof String) {
-CachedStatement statement = isCached((String)args[0]);
+CachedStatement statement = isCached(method, args);
 if (statement!=null) {
 //remove it from the cache since it is used
 removeStatement(statement);
@@ -185,18 +187,25 @@ public class StatementCache extends Stat
 
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
 return cache.get(sql);
 }
 
+public CachedStatement isCached(Method method, Object[] args) {
+@SuppressWarnings("unchecked")
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+return cache.get(createCacheKey(method, args));
+}
+
 public boolean cacheStatement(CachedStatement proxy) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-if (proxy.getSql()==null) {
+ConcurrentHashMap cache =
+

svn commit: r1760906 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 10:05:42 2016
New Revision: 1760906

URL: http://svn.apache.org/viewvc?rev=1760906=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60099
Ensure that use all method arguments as a cache key when using StatementCache.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1760906=1760905=1760906=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Thu Sep 15 10:05:42 2016
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +121,7 @@ public class StatementCache extends Stat
 cacheSize = cacheSizeMap.get(parent);
 this.pcon = con;
 if (!pcon.getAttributes().containsKey(STATEMENT_CACHE_ATTR)) {
-ConcurrentHashMap cache =
+ConcurrentHashMap cache =
 new ConcurrentHashMap<>();
 pcon.getAttributes().put(STATEMENT_CACHE_ATTR,cache);
 }
@@ -130,11 +131,11 @@ public class StatementCache extends Stat
 @Override
 public void disconnected(ConnectionPool parent, PooledConnection con, 
boolean finalizing) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap statements =
-
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap statements =
+
(ConcurrentHashMap)con.getAttributes().get(STATEMENT_CACHE_ATTR);
 
 if (statements!=null) {
-for (Map.Entry p : statements.entrySet()) 
{
+for (Map.Entry p : 
statements.entrySet()) {
 closeStatement(p.getValue());
 }
 statements.clear();
@@ -160,6 +161,7 @@ public class StatementCache extends Stat
 statementProxy.setActualProxy(result);
 statementProxy.setConnection(proxy);
 statementProxy.setConstructor(constructor);
+statementProxy.setCacheKey(createCacheKey(method, args));
 return result;
 } else {
 return super.createDecorator(proxy, method, args, statement, 
constructor, sql);
@@ -170,7 +172,7 @@ public class StatementCache extends Stat
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
 boolean process = process(this.types, method, false);
 if (process && args.length>0 && args[0] instanceof String) {
-CachedStatement statement = isCached((String)args[0]);
+CachedStatement statement = isCached(method, args);
 if (statement!=null) {
 //remove it from the cache since it is used
 removeStatement(statement);
@@ -185,18 +187,25 @@ public class StatementCache extends Stat
 
 public CachedStatement isCached(String sql) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
 return cache.get(sql);
 }
 
+public CachedStatement isCached(Method method, Object[] args) {
+@SuppressWarnings("unchecked")
+ConcurrentHashMap cache =
+
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
+return cache.get(createCacheKey(method, args));
+}
+
 public boolean cacheStatement(CachedStatement proxy) {
 @SuppressWarnings("unchecked")
-ConcurrentHashMap cache =
-
(ConcurrentHashMap)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
-if (proxy.getSql()==null) {
+ConcurrentHashMap cache =
+

[Bug 60132] Javadoc for validationInterval's default value is incorrect

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60132

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #1 from Violeta Georgieva  ---


*** This bug has been marked as a duplicate of bug 60139 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60139] Incorrect javadoc on PoolConfiguration.setValidationInterval

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60139

Violeta Georgieva  changed:

   What|Removed |Added

 CC||awilkin...@pivotal.io

--- Comment #2 from Violeta Georgieva  ---
*** Bug 60132 has been marked as a duplicate of this bug. ***

-- 
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

buildbot success in on tomcat-7-trunk

2016-09-15 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/550

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1760884
Blamelist: kfujino

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60099] StatementCache does not check the scrollable type of result set when searching for a cached statement

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60099

Mohamad ABBAS  changed:

   What|Removed |Added

 OS||All
 CC||mabba...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60117] OneLineFormatter doesn't localize the log level.

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60117

Keiichi Fujino  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Keiichi Fujino  ---
Thanks for the report.
The fix will be in :
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.73 onwards

-- 
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: r1760890 - in /tomcat/tc7.0.x/trunk: java/org/apache/juli/OneLineFormatter.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:48:23 2016
New Revision: 1760890

URL: http://svn.apache.org/viewvc?rev=1760890=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60117
Ensure that the name of LogLevel is localized when using OneLineFormatter. 
Patch provided by Tatsuya Bessho.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1760890=1760889=1760890=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/juli/OneLineFormatter.java Thu Sep 15 
07:48:23 2016
@@ -74,7 +74,7 @@ public class OneLineFormatter extends Fo
 
 // Severity
 sb.append(' ');
-sb.append(record.getLevel());
+sb.append(record.getLevel().getLocalizedName());
 
 // Thread
 sb.append(' ');

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760890=1760889=1760890=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:48:23 2016
@@ -58,6 +58,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+60117: Ensure that the name of LogLevel is
+localized when using OneLineFormatter. Patch provided by
+Tatsuya Bessho. (kfujino)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760889 - in /tomcat/tc8.0.x/trunk: java/org/apache/juli/OneLineFormatter.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:47:22 2016
New Revision: 1760889

URL: http://svn.apache.org/viewvc?rev=1760889=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60117
Ensure that the name of LogLevel is localized when using OneLineFormatter. 
Patch provided by Tatsuya Bessho.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1760889=1760888=1760889=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java Thu Sep 15 
07:47:22 2016
@@ -100,7 +100,7 @@ public class OneLineFormatter extends Fo
 
 // Severity
 sb.append(' ');
-sb.append(record.getLevel());
+sb.append(record.getLevel().getLocalizedName());
 
 // Thread
 sb.append(' ');

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1760889=1760888=1760889=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:47:22 2016
@@ -61,6 +61,11 @@
 Ensure Digester.useContextClassLoader is considered in
 case the class loader is used. (violetagg)
   
+  
+60117: Ensure that the name of LogLevel is
+localized when using OneLineFormatter. Patch provided by
+Tatsuya Bessho. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760888 - in /tomcat/tc8.5.x/trunk: java/org/apache/juli/OneLineFormatter.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:46:23 2016
New Revision: 1760888

URL: http://svn.apache.org/viewvc?rev=1760888=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60117
Ensure that the name of LogLevel is localized when using OneLineFormatter. 
Patch provided by Tatsuya Bessho.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1760888=1760887=1760888=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java Thu Sep 15 
07:46:23 2016
@@ -127,7 +127,7 @@ public class OneLineFormatter extends Fo
 
 // Severity
 sb.append(' ');
-sb.append(record.getLevel());
+sb.append(record.getLevel().getLocalizedName());
 
 // Thread
 sb.append(' ');

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1760888=1760887=1760888=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:46:23 2016
@@ -61,6 +61,11 @@
 Ensure Digester.useContextClassLoader is considered in
 case the class loader is used. (violetagg)
   
+  
+60117: Ensure that the name of LogLevel is
+localized when using OneLineFormatter. Patch provided by
+Tatsuya Bessho. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760887 - in /tomcat/trunk: java/org/apache/juli/OneLineFormatter.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:45:24 2016
New Revision: 1760887

URL: http://svn.apache.org/viewvc?rev=1760887=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60117
Ensure that the name of LogLevel is localized when using OneLineFormatter. 
Patch provided by Tatsuya Bessho.

Modified:
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1760887=1760886=1760887=diff
==
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Thu Sep 15 07:45:24 
2016
@@ -126,7 +126,7 @@ public class OneLineFormatter extends Fo
 
 // Severity
 sb.append(' ');
-sb.append(record.getLevel());
+sb.append(record.getLevel().getLocalizedName());
 
 // Thread
 sb.append(' ');

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1760887=1760886=1760887=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 15 07:45:24 2016
@@ -68,6 +68,11 @@
 Ensure Digester.useContextClassLoader is considered in
 case the class loader is used. (violetagg)
   
+  
+60117: Ensure that the name of LogLevel is
+localized when using OneLineFormatter. Patch provided by
+Tatsuya Bessho. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760884 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:35:17 2016
New Revision: 1760884

URL: http://svn.apache.org/viewvc?rev=1760884=rev
Log:
Add Bugzilla Id.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760884=1760883=1760884=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:35:17 2016
@@ -61,7 +61,7 @@
   
 
   
-Correct Javadocs for
+60139: Correct Javadocs for
 PoolConfiguration.getValidationInterval and
 setValidationInterval. Reported by Phillip Webb. (kfujino)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760883 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:34:44 2016
New Revision: 1760883

URL: http://svn.apache.org/viewvc?rev=1760883=rev
Log:
Add Bugzilla Id.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1760883=1760882=1760883=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:34:44 2016
@@ -110,7 +110,7 @@
 the jmx notification types. (kfujino)
   
   
-Correct Javadocs for
+60139: Correct Javadocs for
 PoolConfiguration.getValidationInterval and
 setValidationInterval. Reported by Phillip Webb. (kfujino)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760882 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:34:06 2016
New Revision: 1760882

URL: http://svn.apache.org/viewvc?rev=1760882=rev
Log:
Add Bugzilla Id.

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1760882=1760881=1760882=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:34:06 2016
@@ -106,7 +106,7 @@
 the jmx notification types. (kfujino)
   
   
-Correct Javadocs for
+60139: Correct Javadocs for
 PoolConfiguration.getValidationInterval and
 setValidationInterval. Reported by Phillip Webb. (kfujino)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60139] Incorrect javadoc on PoolConfiguration.setValidationInterval

2016-09-15 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60139

Keiichi Fujino  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Keiichi Fujino  ---
Thanks for the report.
The fix will be in :
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.73 onwards

-- 
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: r1760881 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:22:59 2016
New Revision: 1760881

URL: http://svn.apache.org/viewvc?rev=1760881=rev
Log:
Correct Javadocs for PoolConfiguration.getValidationInterval and 
setValidationInterval. Reported by Phillip Webb. 

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1760881=1760880=1760881=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 Thu Sep 15 07:22:59 2016
@@ -567,7 +567,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @return the validation interval in milliseconds
  */
 public long getValidationInterval();
@@ -576,7 +576,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @param validationInterval the validation interval in milliseconds
  */
 public void setValidationInterval(long validationInterval);

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760881=1760880=1760881=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:22:59 2016
@@ -58,6 +58,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Correct Javadocs for
+PoolConfiguration.getValidationInterval and
+setValidationInterval. Reported by Phillip Webb. (kfujino)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760877 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:22:09 2016
New Revision: 1760877

URL: http://svn.apache.org/viewvc?rev=1760877=rev
Log:
Correct Javadocs for PoolConfiguration.getValidationInterval and 
setValidationInterval. Reported by Phillip Webb. 

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1760877=1760876=1760877=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 Thu Sep 15 07:22:09 2016
@@ -566,7 +566,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @return the validation interval in milliseconds
  */
 public long getValidationInterval();
@@ -575,7 +575,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @param validationInterval the validation interval in milliseconds
  */
 public void setValidationInterval(long validationInterval);

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1760877=1760876=1760877=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:22:09 2016
@@ -109,6 +109,11 @@
 Ensure that the POOL_EMPTY notification has been added to
 the jmx notification types. (kfujino)
   
+  
+Correct Javadocs for
+PoolConfiguration.getValidationInterval and
+setValidationInterval. Reported by Phillip Webb. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760869 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java webapps/docs/changelog.xml

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:20:59 2016
New Revision: 1760869

URL: http://svn.apache.org/viewvc?rev=1760869=rev
Log:
Correct Javadocs for PoolConfiguration.getValidationInterval and 
setValidationInterval. Reported by Phillip Webb. 

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1760869=1760868=1760869=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 Thu Sep 15 07:20:59 2016
@@ -569,7 +569,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @return the validation interval in milliseconds
  */
 public long getValidationInterval();
@@ -578,7 +578,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @param validationInterval the validation interval in milliseconds
  */
 public void setValidationInterval(long validationInterval);

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1760869=1760868=1760869=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Sep 15 07:20:59 2016
@@ -105,6 +105,11 @@
 Ensure that the POOL_EMPTY notification has been added to
 the jmx notification types. (kfujino)
   
+  
+Correct Javadocs for
+PoolConfiguration.getValidationInterval and
+setValidationInterval. Reported by Phillip Webb. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1760863 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java

2016-09-15 Thread kfujino

Author: kfujino
Date: Thu Sep 15 07:19:55 2016
New Revision: 1760863

URL: http://svn.apache.org/viewvc?rev=1760863=rev
Log:
Correct Javadocs for PoolConfiguration.getValidationInterval and 
setValidationInterval. Reported by Phillip Webb. 

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1760863=1760862=1760863=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
 Thu Sep 15 07:19:55 2016
@@ -569,7 +569,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @return the validation interval in milliseconds
  */
 public long getValidationInterval();
@@ -578,7 +578,7 @@ public interface PoolConfiguration {
  * avoid excess validation, only run validation at most at this frequency 
- time in milliseconds.
  * If a connection is due for validation, but has been validated previously
  * within this interval, it will not be validated again.
- * The default value is 3 (30 seconds).
+ * The default value is 3000 (3 seconds).
  * @param validationInterval the validation interval in milliseconds
  */
 public void setValidationInterval(long validationInterval);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

41 matches

Mail list logo