diff options
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rw-r--r-- | jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/VERSION.txt b/VERSION.txt index c15d888176..8cc66c9957 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -6,6 +6,7 @@ jetty-7.0.1-SNAPSHOT + 289265 Test harness for async input + 289027 deobfuscate HttpClient SSL passwords + 289959 Improved ContextDeployer configuration + + JETTY-1114 unsynchronised WebAppClassloader.getResource(String) jetty-7.0.0 + 289958 StatisticsServlet incorrectly adds StatisticsHandler diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java index 853ad105af..7b4d407667 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java @@ -225,7 +225,7 @@ public class WebAppClassLoader extends URLClassLoader } /* ------------------------------------------------------------ */ - public synchronized URL getResource(String name) + public URL getResource(String name) { URL url= null; boolean tried_parent= false; @@ -264,7 +264,7 @@ public class WebAppClassLoader extends URLClassLoader /* ------------------------------------------------------------ */ @Override - public synchronized Class<?> loadClass(String name) throws ClassNotFoundException + public Class<?> loadClass(String name) throws ClassNotFoundException { return loadClass(name, false); } |