Author: markt
Date: Fri Dec 12 17:44:55 2014
New Revision: 1644992
URL: http://svn.apache.org/r1644992
Log:
Follow on to r1642698.
Only currently running contexts should be returned.
Handle the case where the mapper returns an unwanted non-exact match.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 12 17:44:55 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892,1644910
,1644924,1644929-1644930,1644935
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1644992&r1=1644991&r2=1644992&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Fri Dec 12 17:44:55 2014
@@ -257,6 +257,11 @@ public class ApplicationContext
Container host = context.getParent();
child = (Context) host.findChild(uri);
+ // Non-running contexts should be ignored.
+ if (!child.getState().isAvailable()) {
+ child = null;
+ }
+
// Remove any version information and use the mapper
if (child == null) {
int i = uri.indexOf("##");
@@ -276,15 +281,20 @@ public class ApplicationContext
MappingData mappingData = new MappingData();
((Engine)
host.getParent()).getService().getMapper().map(hostMB, pathMB, null,
mappingData);
- child = mappingData.context;
+ // Must be an exact match. It is no good returning the ROOT
+ // context if the caller is looking for "/something-else"
+ if (mappingData.context.getPath().equals(uri)) {
+ child = mappingData.context;
+ }
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- return (null);
+ return null;
}
- if (child == null)
- return (null);
+ if (child == null) {
+ return null;
+ }
if (context.getCrossContext()) {
// If crossContext is enabled, can always return the context
@@ -294,7 +304,7 @@ public class ApplicationContext
return context.getServletContext();
} else {
// Nothing to return
- return (null);
+ return null;
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1644992&r1=1644991&r2=1644992&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Fri Dec 12 17:44:55 2014
@@ -200,6 +200,7 @@ public class TestApplicationContext exte
Assert.assertTrue(body, body.contains("03-foo1"));
Assert.assertTrue(body, body.contains("04-foo2"));
Assert.assertTrue(body, body.contains("05-foo2"));
+ Assert.assertTrue(body, body.contains("06-null"));
}
@@ -218,6 +219,7 @@ public class TestApplicationContext exte
pw.println("03-" +
sc.getContext("/foo##1").getInitParameter("id"));
pw.println("04-" +
sc.getContext("/foo##2").getInitParameter("id"));
pw.println("05-" +
sc.getContext("/foo##3").getInitParameter("id"));
+ pw.println("06-" + sc.getContext("/unknown"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
