svn commit: r739418 - /tomcat/current/tc5.5.x/STATUS.txt
Author: fhanik Date: Fri Jan 30 21:47:29 2009 New Revision: 739418 URL: http://svn.apache.org/viewvc?rev=739418&view=rev Log: proposal Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=739418&r1=739417&r2=739418&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jan 30 21:47:29 2009 @@ -175,3 +175,10 @@ http://svn.apache.org/viewvc?rev=731773&view=rev +1: markt -1: + +* Lock contention during cookie creation, implementation is single threaded + http://people.apache.org/~fhanik/tomcat/datetool-lock-contention.patch + This patch realizes that DateFormat is not thread safe, but uses them without the need for synchronization using thread locals + +1: fhanik + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46642] New: BeanELResolver involuntarily assigns Integer 0
https://issues.apache.org/bugzilla/show_bug.cgi?id=46642 Summary: BeanELResolver involuntarily assigns Integer 0 Product: Tomcat 6 Version: 6.0.18 Platform: PC OS/Version: Windows XP Status: NEW Severity: critical Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: mjre...@yahoo.com I Switched my Maven Project running in tomcat 5.5 to Tomcat 6.0. Everything is working project is loading pages come up. However We have a search page with various criteria values, one of the is an Integer value the object. On submit all fields are that were not provided with values stayed null except for one. It always get's initialized to 0. This is bad because we generate query on this input and never get an result this value happened to be a user ID and we will never find a user with ID 0. Went back to tomcat 5.5 and the issue went away. -- 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 46642] BeanELResolver involuntarily assigns Integer 0
https://issues.apache.org/bugzilla/show_bug.cgi?id=46642 --- Comment #1 from martin 2009-01-30 13:55:47 PST --- Created an attachment (id=23208) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23208) tomcat6-screen1 -- 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 46642] BeanELResolver involuntarily assigns Integer 0
https://issues.apache.org/bugzilla/show_bug.cgi?id=46642 --- Comment #2 from martin 2009-01-30 13:56:11 PST --- Created an attachment (id=23209) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23209) debug snapshot -- 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: r739427 - /tomcat/trunk/java/org/apache/catalina/util/DateTool.java
Author: fhanik
Date: Fri Jan 30 22:09:15 2009
New Revision: 739427
URL: http://svn.apache.org/viewvc?rev=739427&view=rev
Log:
even not used anywhere in our code, make it thread safe
Modified:
tomcat/trunk/java/org/apache/catalina/util/DateTool.java
Modified: tomcat/trunk/java/org/apache/catalina/util/DateTool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DateTool.java?rev=739427&r1=739426&r2=739427&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/DateTool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/DateTool.java Fri Jan 30
22:09:15 2009
@@ -30,6 +30,7 @@
* @author Jason Hunter [...@eng.sun.com]
* @author James Todd [go...@eng.sun.com]
* @author Costin Manolache
+ * @author fhanik
*/
public class DateTool {
@@ -71,26 +72,45 @@
/**
* DateFormat to be used to format dates
*/
-public final static DateFormat rfc1123Format =
-new SimpleDateFormat(RFC1123_PATTERN, LOCALE_US);
+public final static ThreadLocal rfc1123Format = new
ThreadLocal() {
+@Override
+public DateFormat initialValue() {
+DateFormat result = new SimpleDateFormat(RFC1123_PATTERN,
LOCALE_US);
+result.setTimeZone(GMT_ZONE);
+return result;
+}
+};
/**
* DateFormat to be used to format old netscape cookies
*/
-public final static DateFormat oldCookieFormat =
-new SimpleDateFormat(OLD_COOKIE_PATTERN, LOCALE_US);
-
-public final static DateFormat rfc1036Format =
-new SimpleDateFormat(rfc1036Pattern, LOCALE_US);
-
-public final static DateFormat asctimeFormat =
-new SimpleDateFormat(asctimePattern, LOCALE_US);
-
-static {
-rfc1123Format.setTimeZone(GMT_ZONE);
-oldCookieFormat.setTimeZone(GMT_ZONE);
-rfc1036Format.setTimeZone(GMT_ZONE);
-asctimeFormat.setTimeZone(GMT_ZONE);
-}
+public final static ThreadLocal oldCookieFormat = new
ThreadLocal() {
+@Override
+public DateFormat initialValue() {
+DateFormat result = new SimpleDateFormat(OLD_COOKIE_PATTERN,
LOCALE_US);
+result.setTimeZone(GMT_ZONE);
+return result;
+}
+};
+
+
+
+public final static ThreadLocal rfc1036Format = new
ThreadLocal() {
+@Override
+public DateFormat initialValue() {
+DateFormat result = new SimpleDateFormat(rfc1036Pattern,
LOCALE_US);
+result.setTimeZone(GMT_ZONE);
+return result;
+}
+};
+
+public final static ThreadLocal asctimeFormat = new
ThreadLocal() {
+@Override
+public DateFormat initialValue() {
+DateFormat result = new SimpleDateFormat(asctimePattern,
LOCALE_US);
+result.setTimeZone(GMT_ZONE);
+return result;
+}
+};
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r739449 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java DataSourceFactory.java interceptor/mbeans-descriptors.xml
Author: fhanik
Date: Fri Jan 30 23:32:38 2009
New Revision: 739449
URL: http://svn.apache.org/viewvc?rev=739449&view=rev
Log:
fix sizing issue when db is restarted
fix JMX domain name
fix exception handling
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=739449&r1=739448&r2=739449&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Fri Jan 30 23:32:38 2009
@@ -48,7 +48,7 @@
*/
public class ConnectionPool {
-public static final String POOL_JMX_TYPE_PREFIX =
"org.apache.tomcat.jdbc.pool.jmx:type=";
+public static final String POOL_JMX_TYPE_PREFIX = "tomcat.jdbc:type=";
//logger
protected static Log log = LogFactory.getLog(ConnectionPool.class);
@@ -84,11 +84,6 @@
protected boolean closed = false;
/**
- * Size of the pool
- */
-protected AtomicInteger size = new AtomicInteger(0);
-
-/**
* Since newProxyInstance performs the same operation, over and over
* again, it is much more optimized if we simply store the constructor
ourselves.
*/
@@ -285,7 +280,6 @@
}
if (pool.size()==0 && force && pool!=busy) pool = busy;
}
-size.set(0);
if (this.getPoolProperties().isJmxEnabled()) stopJmx();
PoolProperties.InterceptorDefinition[] proxies =
getPoolProperties().getJdbcInterceptorsAsArray();
for (int i=0; i=poolProperties.getMaxIdle()) ||
(!idle.offer(con))) {
if (log.isDebugEnabled()) {
-log.debug("Connection ["+con+"] will be closed
and not returned to the pool, idle.offer failed.");
+log.debug("Connection ["+con+"] will be closed
and not returned to the pool,
idle["+idle.size()+"]>=maxIdle["+poolProperties.getMaxIdle()+"] idle.offer
failed.");
}
release(con);
}
@@ -757,7 +753,7 @@
}
protected void finalize(PooledConnection con) {
-size.addAndGet(-1);
+
}
protected void startJmx() {
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=739449&r1=739448&r2=739449&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Fri Jan 30 23:32:38 2009
@@ -19,6 +19,7 @@
import java.io.ByteArrayInputStream;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.sql.Connection;
@@ -439,7 +440,11 @@
m = datasource.getClass().getMethod(method.getName(),
method.getParameterTypes());
methods.put(method, m);
}
-return m.invoke(datasource, args);
+try {
+return m.invoke(datasource, args);
+}catch (InvocationTargetException t) {
+throw t.getTargetException();
+}
}
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml?rev=739449&r1=739448&r2=739449&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
Fri Jan 30 23:32:38 2009
@@ -17,7 +17,7 @@
-->
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r739458 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Author: fhanik Date: Sat Jan 31 00:18:24 2009 New Revision: 739458 URL: http://svn.apache.org/viewvc?rev=739458&view=rev Log: adjust for first tag Modified: tomcat/trunk/modules/jdbc-pool/build.xml tomcat/trunk/modules/jdbc-pool/sign.sh Modified: tomcat/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=739458&r1=739457&r2=739458&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Jan 31 00:18:24 2009 @@ -23,8 +23,8 @@ - - + + @@ -34,8 +34,8 @@ - - + + Modified: tomcat/trunk/modules/jdbc-pool/sign.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=739458&r1=739457&r2=739458&view=diff == --- tomcat/trunk/modules/jdbc-pool/sign.sh (original) +++ tomcat/trunk/modules/jdbc-pool/sign.sh Sat Jan 31 00:18:24 2009 @@ -1,4 +1,4 @@ -VERSION=v1.0.14-beta +VERSION=v1.0.1 for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do echo Signing $i echo $1|gpg --passphrase-fd 0 -a -b $i - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn repo layout for modules
ok, I was just about to tag the connection pool, and realized, I'm not setup to do it. I would suggest https://svn.apache.org/repos/asf/tomcat/ - site - tc6.0.x - trunk - modules <-- ADD THIS - jdbc-pool - trunk - tags - branches - bayeux - trunk - tags - branches and move it away and out of (and get rid of) the tomcat/modules folder, and let tomcat be tomcat. Filip - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn repo layout for modules
It's getting spaghetti... If you really have to - no need to add 'modules' - just have them top-level ( i.e. under asf/tomcat ). What prevents you from tagging ? Tag is cheap AFAIK - just tag the entire trunk. I personally hate working with many small repos. I understand the need when you want different ACL and people. I've seen projects with 10x more code and components than tomcat happily under one repo ( and one source tree even ). Costin On Fri, Jan 30, 2009 at 4:44 PM, Filip Hanik - Dev Lists wrote: > ok, I was just about to tag the connection pool, and realized, I'm not > setup to do it. > > I would suggest > > https://svn.apache.org/repos/asf/tomcat/ > - site > - tc6.0.x > - trunk > - modules <-- ADD THIS > - jdbc-pool > - trunk > - tags > - branches > - bayeux > - trunk > - tags > - branches > and move it away and out of (and get rid of) the tomcat/modules folder, > and let tomcat be tomcat. > > Filip > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: svn repo layout for modules
Costin Manolache wrote: It's getting spaghetti... If you really have to - no need to add 'modules' - just have them top-level ( i.e. under asf/tomcat ). spaghetti is historical, all the directories from our older versions. this really boils down to dependencies. with the change in trunk to compile with JDK 1.6 (servlet spec requirement) it no longer makes sense for modules that can run under both tomcat 6, and future tomcat 7 to be part of tomcat-trunk What prevents you from tagging ? Tag is cheap AFAIK - just tag the entire trunk. nothing prevents me from tagging, but if I create 'tags' and 'branches' under tomcat/modules/jdbc-pool, then checking out tomcat, you will get everything, and that is a pain in the rear I personally hate working with many small repos. I understand the need when you want different ACL and people. I've seen projects with 10x more code and components than tomcat happily under one repo ( and one source tree even ). the entire ASF is under one repo, hence /repos/asf/... Costin On Fri, Jan 30, 2009 at 4:44 PM, Filip Hanik - Dev Lists wrote: ok, I was just about to tag the connection pool, and realized, I'm not setup to do it. I would suggest https://svn.apache.org/repos/asf/tomcat/ - site - tc6.0.x - trunk - modules <-- ADD THIS - jdbc-pool - trunk - tags - branches - bayeux - trunk - tags - branches and move it away and out of (and get rid of) the tomcat/modules folder, and let tomcat be tomcat. Filip - 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
Re: svn repo layout for modules
How about adding .../tomcat/tags ? Mark Filip Hanik - Dev Lists wrote: > Costin Manolache wrote: >> It's getting spaghetti... If you really have to - no need to add >> 'modules' - >> just have them top-level ( i.e. under asf/tomcat ). >> > spaghetti is historical, all the directories from our older versions. > this really boils down to dependencies. > with the change in trunk to compile with JDK 1.6 (servlet spec > requirement) it no longer makes sense for modules that can run under > both tomcat 6, and future tomcat 7 to be part of tomcat-trunk >> What prevents you from tagging ? Tag is cheap AFAIK - just tag the entire >> trunk. >> > nothing prevents me from tagging, but if I create 'tags' and 'branches' > under tomcat/modules/jdbc-pool, then checking out tomcat, you will get > everything, and that is a pain in the rear >> I personally hate working with many small repos. I understand the need >> when >> you want different ACL and >> people. I've seen projects with 10x more code and components than tomcat >> happily under one repo >> ( and one source tree even ). >> > the entire ASF is under one repo, hence /repos/asf/... > > >> Costin >> >> On Fri, Jan 30, 2009 at 4:44 PM, Filip Hanik - Dev Lists >> > >>> wrote: >>> >> >> >>> ok, I was just about to tag the connection pool, and realized, I'm not >>> setup to do it. >>> >>> I would suggest >>> >>> https://svn.apache.org/repos/asf/tomcat/ >>> - site >>> - tc6.0.x >>> - trunk >>> - modules <-- ADD THIS >>> - jdbc-pool >>> - trunk >>> - tags >>> - branches >>> - bayeux >>> - trunk >>> - tags >>> - branches >>> and move it away and out of (and get rid of) the tomcat/modules folder, >>> and let tomcat be tomcat. >>> >>> Filip >>> >>> >>> - >>> 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 46642] BeanELResolver involuntarily assigns Integer 0
https://issues.apache.org/bugzilla/show_bug.cgi?id=46642 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #3 from Mark Thomas 2009-01-30 21:44:54 PST --- Coercion of nulls to zero for numerics is required by the EL spec. You can disable this if required setting the system property org.apache.el.parser.COERCE_TO_ZERO to false. Be aware that relying on this functionality will make your application non-portable. -- 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: r739517 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml
Author: markt
Date: Sat Jan 31 07:36:49 2009
New Revision: 739517
URL: http://svn.apache.org/viewvc?rev=739517&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608
Prevent race condition for allocate/deallocate in StandardWrapper
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 31 07:36:49 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,729815,729934,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,729815,729934,730250,732859
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=739517&r1=739516&r2=739517&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan 31 07:36:49 2009
@@ -38,14 +38,6 @@
0: remm (looks risky, very minor problem), fhanik - minor problem
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608
- Prevent race condition for allocate/deallocate in StandardWrapper
- http://svn.apache.org/viewvc?rev=685177&view=rev
- +1: markt, funkman, fhanik
- 0: remm: The only unsafe usage of this field is to implement the gimmick
loop-wait hack,
-which to me means adding any sort of sync is not worth it.
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45074
http://svn.apache.org/viewvc?rev=689402&view=rev
+1: jfclere, funkman, fhanik
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=739517&r1=739516&r2=739517&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat
Jan 31 07:36:49 2009
@@ -28,6 +28,7 @@
import java.util.HashSet;
import java.util.Properties;
import java.util.Stack;
+import java.util.concurrent.atomic.AtomicInteger;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -135,7 +136,7 @@
* The count of allocations that are currently active (even if they
* are for the same instance, as will be true on a non-STM servlet).
*/
-protected int countAllocated = 0;
+protected AtomicInteger countAllocated = new AtomicInteger(0);
/**
@@ -340,7 +341,7 @@
*/
public int getCountAllocated() {
-return (this.countAllocated);
+return (this.countAllocated.get());
}
@@ -810,7 +811,7 @@
// condition with unload. Bug 43683, test case #3
if (!singleThreadModel) {
newInstance = true;
-countAllocated++;
+countAllocated.incrementAndGet();
}
} catch (ServletException e) {
throw e;
@@ -828,7 +829,7 @@
// For new instances, count will have been incremented at the
// time of creation
if (!newInstance) {
-countAllocated++;
+countAllocated.incrementAndGet();
}
return (instance);
}
@@ -836,7 +837,7 @@
synchronized (instancePool) {
-while (countAllocated >= nInstances) {
+while (countAllocated.get() >= nInstances) {
// Allocate a new instance if possible, or else wait
if (nInstances < maxInstances) {
try {
@@ -858,7 +859,7 @@
}
if (log.isTraceEnabled())
DO NOT REPLY [Bug 45608] Race conditions on field countAllocated of class org.apache.catalina.core.StandardWrapper
https://issues.apache.org/bugzilla/show_bug.cgi?id=45608 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2009-01-30 23:39:28 PST --- This has now been fixed in 6.0.x and will be included in 6.0.19 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: r739519 - in /tomcat/connectors/trunk/jk: native/common/jk_map.c native/common/jk_map.h native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Sat Jan 31 07:40:21 2009
New Revision: 739519
URL: http://svn.apache.org/viewvc?rev=739519&view=rev
Log:
Fix bz46579 by adding the local environment table
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_map.h
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=739519&r1=739518&r2=739519&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sat Jan 31 07:40:21 2009
@@ -80,6 +80,7 @@
static void trim_prp_comment(char *prp);
static size_t trim(char *s);
static int map_realloc(jk_map_t *m);
+jk_map_t *jk_environment_map = NULL;
int jk_map_alloc(jk_map_t **m)
{
@@ -710,6 +711,12 @@
if (!env_value) {
env_value = getenv(env_name);
}
+if (!env_value && jk_environment_map) {
+/* Search inside local environment table */
+env_value = jk_map_get_string(jk_environment_map,
+ env_name, NULL);
+}
+
#if defined(WIN32)
if (!env_value) {
/* Try the env block from calling process */
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.h?rev=739519&r1=739518&r2=739519&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.h Sat Jan 31 07:40:21 2009
@@ -37,6 +37,9 @@
struct jk_map;
typedef struct jk_map jk_map_t;
+/* Local environment table */
+jk_map_t *jk_environment_map;
+
int jk_map_alloc(jk_map_t **m);
int jk_map_free(jk_map_t **m);
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=739519&r1=739518&r2=739519&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sat Jan 31 07:40:21
2009
@@ -2313,8 +2313,9 @@
if ((p = strrchr(fname, '\\'))) {
*(p++) = '\0';
StringCbCopy(dll_file_path, MAX_PATH, fname);
-SetEnvironmentVariable("JKISAPI_PATH", dll_file_path);
-SetEnvironmentVariable("JKISAPI_NAME", p);
+jk_map_alloc(&jk_environment_map);
+jk_map_add(jk_environment_map, "JKISAPI_PATH", dll_file_path);
+jk_map_add(jk_environment_map, "JKISAPI_NAME", p);
}
else {
/* Cannot obtain file name ? */
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=739519&r1=739518&r2=739519&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Jan 31
07:40:21 2009
@@ -43,6 +43,10 @@
+
+46579: Use local environment table instead environment
+variables for setting the JKISAPI_PATH and JKISAPI_NAME. (mturk)
+
Apache: Add more environment variables to overwrite request
information. Useful in case a proxy is in front of Apache and sends
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46579] JKISAPI_PATH & JKISAPI_NAME not usable with multiple ISAPI instances
https://issues.apache.org/bugzilla/show_bug.cgi?id=46579 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk 2009-01-30 23:42:15 PST --- Fixed in the SVN (r739519 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=739519 ) -- 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
