svn commit: r940660 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Author: markt
Date: Mon May 3 22:50:52 2010
New Revision: 940660
URL: http://svn.apache.org/viewvc?rev=940660&view=rev
Log:
Move ManagerBase to new Lifecycle/MBean implementation
Fix a bunch of Eclipse/FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=940660&r1=940659&r2=940660&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon May 3
22:50:52 2010
@@ -38,23 +38,19 @@ import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
-import javax.management.MBeanRegistration;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
import org.apache.catalina.Container;
+import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.util.LifecycleBase;
+import org.apache.catalina.mbeans.MBeanUtils;
+import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.modeler.Registry;
/**
@@ -66,8 +62,8 @@ import org.apache.tomcat.util.modeler.Re
* @version $Id$
*/
-public abstract class ManagerBase extends LifecycleBase
-implements Manager, MBeanRegistration {
+public abstract class ManagerBase extends LifecycleMBeanBase
+implements Manager {
private final Log log = LogFactory.getLog(ManagerBase.class); // must not
be static
@@ -189,7 +185,7 @@ public abstract class ManagerBase extend
private final Object maxActiveUpdateLock = new Object();
// number of duplicated session ids - anything >0 means we have problems
-protected int duplicates=0;
+protected volatile int duplicates=0;
/**
* Processing time during session expiration.
@@ -371,9 +367,8 @@ public abstract class ManagerBase extend
boolean oldDistributable = this.distributable;
this.distributable = distributable;
support.firePropertyChange("distributable",
- new Boolean(oldDistributable),
- new Boolean(this.distributable));
-
+ Boolean.valueOf(oldDistributable),
+ Boolean.valueOf(this.distributable));
}
@@ -395,7 +390,7 @@ public abstract class ManagerBase extend
paramTypes[1] = int.class;
Object paramValues[] = new Object[2];
paramValues[0] = result;
-paramValues[1] = new Integer(32);
+paramValues[1] = Integer.valueOf(32);
Method method = Class.forName("org.apache.tomcat.jni.OS")
.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
@@ -463,8 +458,8 @@ public abstract class ManagerBase extend
int oldMaxInactiveInterval = this.maxInactiveInterval;
this.maxInactiveInterval = interval;
support.firePropertyChange("maxInactiveInterval",
- new Integer(oldMaxInactiveInterval),
- new Integer(this.maxInactiveInterval));
+ Integer.valueOf(oldMaxInactiveInterval),
+ Integer.valueOf(this.maxInactiveInterval));
}
@@ -493,8 +488,8 @@ public abstract class ManagerBase extend
int oldSessionIdLength = this.sessionIdLength;
this.sessionIdLength = idLength;
support.firePropertyChange("sessionIdLength",
- new Integer(oldSessionIdLength),
- new Integer(this.sessionIdLength));
+ Integer.valueOf(oldSessionIdLength),
+ Integer.valueOf(this.sessionIdLength));
}
@@ -671,8 +666,8 @@ public abstract class ManagerBase extend
int oldProcessExpiresFrequency = this.processExpiresFrequency;
this.processExpiresFrequency = processExpiresFrequency;
support.firePropertyChange("processExpiresFrequency",
- new Integer(oldProcessExpiresFrequency),
- new Integer(this.processExpiresFrequency));
+ Integer.valu
svn commit: r940658 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: markt
Date: Mon May 3 22:29:11 2010
New Revision: 940658
URL: http://svn.apache.org/viewvc?rev=940658&view=rev
Log:
Remove unnecessary code
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=940658&r1=940657&r2=940658&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Mon May 3 22:29:11 2010
@@ -33,7 +33,7 @@ import org.apache.catalina.Container;
* @version $Id$
*/
-public abstract class ClusterManagerBase extends ManagerBase implements
Lifecycle, PropertyChangeListener, ClusterManager{
+public abstract class ClusterManagerBase extends ManagerBase implements
PropertyChangeListener, ClusterManager{
public static ClassLoader[] getClassLoaders(Container container) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49134] Server.stop() doesn't unregister all MBeans
https://issues.apache.org/bugzilla/show_bug.cgi?id=49134 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-05-03 18:22:43 EDT --- I'm about half way through the MBean/Lifecycle re-factoring and this issue is now fixed. I tweaked the provided unit test a little to: - ensure there are no Cataina mbeans - a sufficient number of Tomcat MBeans (20) get created - that all the Tomcat MBeans get cleaned up on tomcat.destroy() Clean-up is not expected on a stop() as components may get re-started. -- 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: r940656 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Author: markt
Date: Mon May 3 22:18:43 2010
New Revision: 940656
URL: http://svn.apache.org/viewvc?rev=940656&view=rev
Log:
Fix the tests the Lifecycle/MBean refactoring in r940634 broke.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=940656&r1=940655&r2=940656&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon May 3
22:18:43 2010
@@ -850,19 +850,10 @@ public class Connector extends Lifecycle
IntrospectionUtils.setProperty(protocolHandler, "jkHome",
System.getProperty("catalina.base"));
-try {
-protocolHandler.init();
-} catch (Exception e) {
-throw new LifecycleException
-(sm.getString
- ("coyoteConnector.protocolHandlerInitializationFailed", e));
-}
-
onameProtocolHandler = register(protocolHandler,
createObjectNameKeyProperties("ProtocolHandler"));
mapperListener.setDomain(getDomain());
-mapperListener.init();
onameMapper = register(mapperListener,
createObjectNameKeyProperties("Mapper"));
@@ -879,6 +870,16 @@ public class Connector extends Lifecycle
setState(LifecycleState.STARTING);
+// Protocol handlers do not follow Lifecycle conventions.
+// protocolHandler.init() needs to wait until the connector.start()
+try {
+protocolHandler.init();
+} catch (Exception e) {
+throw new LifecycleException
+(sm.getString
+ ("coyoteConnector.protocolHandlerInitializationFailed", e));
+}
+
try {
protocolHandler.start();
} catch (Exception e) {
@@ -891,6 +892,9 @@ public class Connector extends Lifecycle
(errPrefix + " " + sm.getString
("coyoteConnector.protocolHandlerStartFailed", e));
}
+
+// MapperListener doesn't follow Lifecycle conventions either
+mapperListener.init();
}
@@ -904,15 +908,8 @@ public class Connector extends Lifecycle
setState(LifecycleState.STOPPING);
-}
-
-
-@Override
-protected void destroyInternal() throws LifecycleException {
-mapperListener.destroy();
-unregister(onameMapper);
-unregister(onameProtocolHandler);
-
+// Protocol handlers do not follow Lifecycle conventions.
+// protocolHandler.destroy() needs to be called in connector.stop()
try {
protocolHandler.destroy();
} catch (Exception e) {
@@ -921,6 +918,16 @@ public class Connector extends Lifecycle
("coyoteConnector.protocolHandlerDestroyFailed", e));
}
+// MapperListener doesn't follow Lifecycle conventions either
+mapperListener.destroy();
+}
+
+
+@Override
+protected void destroyInternal() throws LifecycleException {
+unregister(onameMapper);
+unregister(onameProtocolHandler);
+
if (getService() != null) {
getService().removeConnector(this);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940634 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/catalina/mbeans/ j
Author: markt
Date: Mon May 3 21:40:52 2010
New Revision: 940634
URL: http://svn.apache.org/viewvc?rev=940634&view=rev
Log:
With the benefit of some sleep, refactor the MBean support for Lifecycle (still
some components to convert)
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49134
Thanks to Marc Guillemot whose test case for 49134 provided the basis of
o.a.c.mbeans.TestRegistration
Added:
tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java (with
props)
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
- copied, changed from r940487,
tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
Removed:
tomcat/trunk/java/org/apache/catalina/LifecycleMBeanRegistration.java
tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=940634&r1=940633&r2=940634&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon May 3
21:40:52 2010
@@ -20,16 +20,14 @@ package org.apache.catalina.connector;
import java.util.HashMap;
-import javax.management.MBeanRegistration;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.util.LifecycleBase;
+import org.apache.catalina.mbeans.MBeanUtils;
+import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
@@ -37,7 +35,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.http.mapper.Mapper;
-import org.apache.tomcat.util.modeler.Registry;
/**
@@ -49,7 +46,7 @@ import org.apache.tomcat.util.modeler.Re
*/
-public class Connector extends LifecycleBase implements MBeanRegistration {
+public class Connector extends LifecycleMBeanBase {
private static final Log log = LogFactory.getLog(Connector.class);
@@ -796,12 +793,11 @@ public class Connector extends Lifecycle
}
-protected ObjectName createObjectName(String domain, String type)
-throws MalformedObjectNameException {
+protected String createObjectNameKeyProperties(String type) {
+
Object addressObj = getProperty("address");
-StringBuilder sb = new StringBuilder(domain);
-sb.append(":type=");
+StringBuilder sb = new StringBuilder("type=");
sb.append(type);
sb.append(",port=");
sb.append(getPort());
@@ -812,8 +808,7 @@ public class Connector extends Lifecycle
sb.append(ObjectName.quote(address));
}
}
-ObjectName _oname = new ObjectName(sb.toString());
-return _oname;
+return sb.toString();
}
@@ -843,6 +838,37 @@ public class Connector extends Lifecycle
}
+@Override
+protected void initInternal() throws LifecycleException {
+
+super.initInternal();
+
+// Initialize adapter
+adapter = new CoyoteAdapter(this);
+protocolHandler.setAdapter(adapter);
+
+IntrospectionUtils.setProperty(protocolHandler, "jkHome",
+ System.getProperty("catalina.base"));
+
+try {
+protocolHandler.init();
+} catch (Exception e) {
+throw new LifecycleException
+(sm.getString
+ ("coyoteConnector.protocolHandlerInitializationFailed", e));
+}
+
+onameProtocolH
DO NOT REPLY [Bug 49241] DataSourceFactory.parsePoolProperties() doesn't look for "suspectTimeout"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Filip Hanik 2010-05-03 15:13:28 EDT --- Thank you very much! -- 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: r940574 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Author: fhanik
Date: Mon May 3 19:12:48 2010
New Revision: 940574
URL: http://svn.apache.org/viewvc?rev=940574&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
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=940574&r1=940573&r2=940574&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
Mon May 3 19:12:48 2010
@@ -109,6 +109,8 @@ public class DataSourceFactory implement
protected static final String PROP_DATASOURCE= "dataSource";
protected static final String PROP_DATASOURCE_JNDI = "dataSourceJNDI";
+protected static final String PROP_SUSPECT_TIMEOUT = "suspectTimeout";
+
public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
@@ -452,6 +454,11 @@ public class DataSourceFactory implement
if (value != null) {
poolProperties.setDataSourceJNDI(value);
}
+
+value = properties.getProperty(PROP_SUSPECT_TIMEOUT);
+if (value != null) {
+poolProperties.setSuspectTimeout(Integer.parseInt(value));
+}
return poolProperties;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940517 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Author: markt
Date: Mon May 3 17:15:00 2010
New Revision: 940517
URL: http://svn.apache.org/viewvc?rev=940517&view=rev
Log:
Remove classes that are no longer in the source tree
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=940517&r1=940516&r2=940517&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Mon May 3
17:15:00 2010
@@ -78,16 +78,6 @@ public class MBeanUtils {
* is a class name, and the second element is the managed bean name.
*/
private static String exceptions[][] = {
-{ "org.apache.ajp.tomcat4.Ajp13Connector",
- "Ajp13Connector" },
-{ "org.apache.coyote.tomcat4.Ajp13Connector",
- "CoyoteConnector" },
-{ "org.apache.catalina.users.JDBCGroup",
- "Group" },
-{ "org.apache.catalina.users.JDBCRole",
- "Role" },
-{ "org.apache.catalina.users.JDBCUser",
- "User" },
{ "org.apache.catalina.users.MemoryGroup",
"Group" },
{ "org.apache.catalina.users.MemoryRole",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940487 - /tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
Author: markt
Date: Mon May 3 15:47:15 2010
New Revision: 940487
URL: http://svn.apache.org/viewvc?rev=940487&view=rev
Log:
Better error message
Modified:
tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java?rev=940487&r1=940486&r2=940487&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java Mon May
3 15:47:15 2010
@@ -56,7 +56,7 @@ public class RegistrationTest extends To
// Verify there are some Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
-assertTrue("No Tomcat MBeans", onames.size() >= 20);
+assertTrue("Not enough Tomcat MBeans", onames.size() >= 20);
tomcat.stop();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r940189 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
On 05/03/2010 02:54 AM, jean-frederic clere wrote:
On 05/02/2010 10:52 PM, Filip Hanik - Dev Lists wrote:
On 05/02/2010 04:02 AM, jfcl...@apache.org wrote:
-// endpoint.processSocket(this.socket,
SocketStatus.STOP);
+try {
+asyncDispatch(SocketStatus.STOP); // What to do
with return code ?
What you want to do here, is let the Endpoint know that stop is called.
Yep.
The end point will then dispatch a new thread to handle the request
Some more logic is missing in the Endpoint then, no?
correct. Look at JioEndpoint on the processSocket part
Filip
Cheers
Jean-Frederic
-
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 49241] DataSourceFactory.parsePoolProperties() doesn't look for "suspectTimeout"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241 --- Comment #2 from Matt Passell 2010-05-03 10:04:29 EDT --- Created an attachment (id=25391) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25391) Adds constant and property handling for suspectTimeout to DataSourceFactory I added the constant PROP_SUSPECT_TIMEOUT and code to read the "suspectTimeout" property from the Properties object, parse it to an int, and pass it into PoolProperties.setSuspectTimeout(). I looked over all the other fields of PoolProperties and it looks like there are being properly converted. -- 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 49218] Fix support for META-INF/resources
https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
--- Comment #6 from Peter Rossbach 2010-05-03 05:48:36 EDT
---
(In reply to comment #5)
> (In reply to comment #4)
> TestStandardContextResources calling resourceF.jsp in r939650 checks for wrong
> value. It should look for "resourceF.jsp in resources.jar".
Fix with 940405. Sorry!
>
> Besides that, it really uncovered a bug. The test fails because of the
> following:
>
> 5. In BaseDirContext#lookup():
> altDirContext.lookup("META-INF/resources/" + name) does not return null, but
> throws a NamingException, which aborts the for( : altDirContexts) cycle.
Ok, look at listBindings. We can ignore the sub Exceptions.
Fixed!
>
> So, either lookup for resourceF.jsp or for resourceF.jsp will fail, depending
> on the order in altDirContexts (the spec says that the order is arbitrary).
>
>
> 6. Also in BaseDirContext#lookup():
> doLookup(name) call is also documented to throw NamingException.
> Either it does not throw it and the doLookup method signature has to be
> updated
> (or at least add a JavaDoc there), or the code is broken.
+1 .. Go ahead to fix doLookup(name)!
--
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: r940405 - in /tomcat/trunk: java/org/apache/naming/resources/BaseDirContext.java test/org/apache/catalina/core/TestStandardContextResources.java test/webapp-3.0-fragments/WEB-INF/lib/resou
Author: pero
Date: Mon May 3 09:44:39 2010
New Revision: 940405
URL: http://svn.apache.org/viewvc?rev=940405&view=rev
Log:
Search to more jars and fix testcase!
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=940405&r1=940404&r2=940405&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Mon May
3 09:44:39 2010
@@ -456,9 +456,13 @@ public abstract class BaseDirContext imp
// Check the alternate locations
for (DirContext altDirContext : altDirContexts) {
-obj = altDirContext.lookup("META-INF/resources/" + name);
-if (obj != null)
-return obj;
+try {
+obj = altDirContext.lookup("META-INF/resources/" + name);
+if (obj != null)
+return obj;
+} catch ( NamingException ex) {
+// ignore
+}
}
// Really not found
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=940405&r1=940404&r2=940405&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Mon May 3 09:44:39 2010
@@ -84,7 +84,7 @@ public class TestStandardContextResource
tomcat.start();
assertPageContains("/test/getresource?path=/resourceF.jsp",
-"resourceF.jsp in the web application");
+"resourceF.jsp in resources2.jar");
assertPageContains("/test/getresource?path=/resourceA.jsp",
"resourceA.jsp in the web application");
assertPageContains("/test/getresource?path=/resourceB.jsp",
Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar?rev=940405&r1=940404&r2=940405&view=diff
==
Binary files - no diff available.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Java Servlet 3.0, Java Server Pages 2.2 & Expression Languag... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 20 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-03052010.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-03052010-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-03052010-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-03052010.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/srv/gump/public/workspa ce/apache-commons/dbcp -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-03052010.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomca t-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/ eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-03052010.jar:/srv/gump/public/workspace/apa
Re: svn commit: r940189 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
On 05/02/2010 10:52 PM, Filip Hanik - Dev Lists wrote:
> On 05/02/2010 04:02 AM, jfcl...@apache.org wrote:
>> -// endpoint.processSocket(this.socket,
>> SocketStatus.STOP);
>> +try {
>> +asyncDispatch(SocketStatus.STOP); // What to do
>> with return code ?
>>
> What you want to do here, is let the Endpoint know that stop is called.
Yep.
> The end point will then dispatch a new thread to handle the request
Some more logic is missing in the Endpoint then, no?
Cheers
Jean-Frederic
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
