Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSION.txt3
-rw-r--r--example-jetty-embedded/pom.xml2
-rw-r--r--jetty-aggregate/jetty-all-server/pom.xml2
-rw-r--r--jetty-aggregate/jetty-all/pom.xml2
-rw-r--r--jetty-aggregate/jetty-client/pom.xml2
-rw-r--r--jetty-aggregate/jetty-plus/pom.xml2
-rw-r--r--jetty-aggregate/jetty-server/pom.xml2
-rw-r--r--jetty-aggregate/jetty-servlet/pom.xml2
-rw-r--r--jetty-aggregate/jetty-webapp/pom.xml2
-rw-r--r--jetty-aggregate/pom.xml2
-rw-r--r--jetty-ajp/pom.xml2
-rw-r--r--jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java21
-rw-r--r--jetty-annotations/pom.xml2
-rw-r--r--jetty-client/pom.xml2
-rw-r--r--jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java1
-rw-r--r--jetty-continuation/pom.xml2
-rw-r--r--jetty-deploy/pom.xml2
-rw-r--r--jetty-distribution/pom.xml2
-rw-r--r--jetty-http/pom.xml2
-rw-r--r--jetty-io/pom.xml2
-rw-r--r--jetty-jaspi/pom.xml2
-rw-r--r--jetty-jmx/pom.xml2
-rw-r--r--jetty-jndi/pom.xml2
-rw-r--r--jetty-jsp-2.1/pom.xml2
-rw-r--r--jetty-nested/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-jsp/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-logback/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-warurl/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-httpservice/pom.xml2
-rw-r--r--jetty-osgi/pom.xml2
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml2
-rw-r--r--jetty-overlay-deployer/pom.xml5
-rw-r--r--jetty-plus/pom.xml2
-rw-r--r--jetty-policy/pom.xml2
-rw-r--r--jetty-rewrite/pom.xml2
-rw-r--r--jetty-security/pom.xml2
-rw-r--r--jetty-server/pom.xml2
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java44
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java10
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java3
-rw-r--r--jetty-servlet/pom.xml2
-rw-r--r--jetty-servlets/pom.xml2
-rw-r--r--jetty-start/pom.xml2
-rw-r--r--jetty-util/pom.xml2
-rw-r--r--jetty-util/src/main/java/org/eclipse/jetty/util/thread/OldQueuedThreadPool.java612
-rw-r--r--jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java5
-rw-r--r--jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java11
-rw-r--r--jetty-webapp/pom.xml2
-rw-r--r--jetty-websocket/pom.xml2
-rw-r--r--jetty-xml/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--test-continuation-jetty6/pom.xml2
-rw-r--r--test-continuation/pom.xml2
-rw-r--r--test-jetty-nested/pom.xml2
-rw-r--r--test-jetty-servlet/pom.xml2
-rw-r--r--test-jetty-webapp/pom.xml2
-rw-r--r--tests/pom.xml2
-rw-r--r--tests/test-integration/pom.xml2
-rw-r--r--tests/test-loginservice/pom.xml2
-rw-r--r--tests/test-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-hash-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-jdbc-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-sessions-common/pom.xml2
-rw-r--r--tests/test-webapps/pom.xml2
-rw-r--r--tests/test-webapps/test-webapp-rfc2616/pom.xml2
66 files changed, 139 insertions, 694 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 4df8f5c87d..74b2bf0d28 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -9,6 +9,7 @@ jetty-7.4.0.RC0
+ 339187 In the OSGi manifest of the jetty-all-server aggregate, mark javax.annotation as optional
+ 339543 Add configuration options for Certificate Revocation checking
+ 340265 Improve handling of io shutdown in SSL
+ + 340621 Added SizedThreadPool interface
+ 340636 HashSessionManager lazy loads all sessions
+ 340838 Update ConnectHandler to perform half closes properly
+ 340878 Integrations should be able to load their own keystores
@@ -28,6 +29,8 @@ jetty-7.4.0.RC0
+ 341736 Split jetty-nested out of war module
+ 341726 JSONPojoConverter handles characters
+ 341992 Overlayed context deployer
+ + 341694 Disable AJP buffer resizing
+ + 341850 Protect QTP dump from bad stacks
+ JETTY-1245 Pooled Buffers implementation
+ JETTY-1354 Added jetty-nested
+ Ensure generated fragment names are unique
diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index 278fe435e6..70e31aeb47 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>example-jetty-embedded</artifactId>
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 79d70f51e8..57660b6cb9 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 37295de723..9cc2b7e8f4 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml
index e8d9fd439c..b6fb0011d8 100644
--- a/jetty-aggregate/jetty-client/pom.xml
+++ b/jetty-aggregate/jetty-client/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index 0767b32a56..f091a08e8f 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index 2d69f58857..2d93936f51 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index a965e68785..8aee9fe313 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index efc580f383..054d39c537 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml
index 6b3d2d00ac..40feb0b102 100644
--- a/jetty-aggregate/pom.xml
+++ b/jetty-aggregate/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index f80d58b472..2705b3821e 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ajp</artifactId>
diff --git a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
index da3299414f..7ae891f726 100644
--- a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
+++ b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
@@ -162,7 +162,28 @@ public class Ajp13Generator extends AbstractGenerator
_buffer = null; // Buffer for copy of passed _content
_content = null; // Buffer passed to addContent
+ }
+ /* ------------------------------------------------------------ */
+ @Override
+ public int getContentBufferSize()
+ {
+ try
+ {
+ initContent();
+ }
+ catch(IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ return super.getContentBufferSize()-7;
+ }
+
+ /* ------------------------------------------------------------ */
+ @Override
+ public void increaseContentBufferSize(int contentBufferSize)
+ {
+ // Not supported with AJP
}
/* ------------------------------------------------------------ */
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 49752db7ec..6d7a31bebc 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-annotations</artifactId>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index a527f33de7..5b0a6e19a2 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java
index 4d60a0b79d..68b7e25671 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ProxyTunnellingTest.java
@@ -216,6 +216,7 @@ public class ProxyTunnellingTest
{
latch.countDown();
}
+
};
exchange.setMethod(HttpMethods.GET);
String body = "BODY";
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 7c59418081..b1fd2e613e 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-continuation</artifactId>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 7a4b8b14a5..2d9774e423 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-deploy</artifactId>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 4a29eb02e6..a964c383e7 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>jetty-distribution</artifactId>
<name>Jetty :: Distribution Assemblies</name>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 4a79447ba0..3438b2f692 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 9c077e859e..bdc2c2f8b0 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index cc4c48eb54..203fbb5ec7 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jaspi</artifactId>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index e47291bbcf..a730aaba9e 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmx</artifactId>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index ad72112e3a..97777d196d 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jndi</artifactId>
diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml
index 4c97e27be8..1a09ab9c1d 100644
--- a/jetty-jsp-2.1/pom.xml
+++ b/jetty-jsp-2.1/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jsp-2.1</artifactId>
diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml
index 611eee76a2..48160f1a68 100644
--- a/jetty-nested/pom.xml
+++ b/jetty-nested/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>jetty-nested</artifactId>
<name>Jetty :: Nested</name>
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index c3b10a0b3a..37bd9ffe79 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index e784e2d451..64ca9e45df 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index bf53eb358c..2107554e57 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 89390cde1a..9a60df68f8 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 2f71f54a48..784d37f124 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index a4411c3616..55ba111fd1 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.osgi</groupId>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 8d0f49906e..5b0a732d6c 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml
index 43bc76f14f..837fea8478 100644
--- a/jetty-overlay-deployer/pom.xml
+++ b/jetty-overlay-deployer/pom.xml
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-overlay-deployer</artifactId>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index d6c1b741a8..fc8ea2701d 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-plus</artifactId>
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index c08717b8a3..09aa049945 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-policy</artifactId>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 02d0d738cf..4b9d7ef268 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-rewrite</artifactId>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 6a29d6d154..b78f36f4bc 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-security</artifactId>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index cea58417a3..c2ee06f4ec 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
index e78094207e..55d148a731 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
@@ -288,6 +288,11 @@ public class ResourceCache
try
{
int len=(int)resource.length();
+ if (len<0)
+ {
+ Log.warn("invalid resource: "+String.valueOf(resource)+" "+len);
+ return null;
+ }
Buffer buffer = new IndirectNIOBuffer(len);
InputStream is = resource.getInputStream();
buffer.readFrom(is,len);
@@ -310,6 +315,11 @@ public class ResourceCache
return new DirectNIOBuffer(resource.getFile());
int len=(int)resource.length();
+ if (len<0)
+ {
+ Log.warn("invalid resource: "+String.valueOf(resource)+" "+len);
+ return null;
+ }
Buffer buffer = new DirectNIOBuffer(len);
InputStream is = resource.getInputStream();
buffer.readFrom(is,len);
@@ -435,14 +445,14 @@ public class ResourceCache
Buffer buffer = _indirectBuffer.get();
if (buffer==null)
{
- synchronized (_indirectBuffer)
- {
- if (_indirectBuffer.get()==null)
- {
- buffer=ResourceCache.this.getIndirectBuffer(_resource);
- _indirectBuffer.set(buffer);
- }
- }
+ Buffer buffer2=ResourceCache.this.getIndirectBuffer(_resource);
+
+ if (buffer2==null)
+ Log.warn("Could not load "+this);
+ else if (_indirectBuffer.compareAndSet(null,buffer2))
+ buffer=buffer2;
+ else
+ buffer=_indirectBuffer.get();
}
if (buffer==null)
return null;
@@ -456,14 +466,14 @@ public class ResourceCache
Buffer buffer = _directBuffer.get();
if (buffer==null)
{
- synchronized (_directBuffer)
- {
- if (_directBuffer.get()==null)
- {
- buffer=ResourceCache.this.getDirectBuffer(_resource);
- _directBuffer.set(buffer);
- }
- }
+ Buffer buffer2=ResourceCache.this.getDirectBuffer(_resource);
+
+ if (buffer2==null)
+ Log.warn("Could not load "+this);
+ else if (_directBuffer.compareAndSet(null,buffer2))
+ buffer=buffer2;
+ else
+ buffer=_directBuffer.get();
}
if (buffer==null)
return null;
@@ -491,7 +501,7 @@ public class ResourceCache
@Override
public String toString()
{
- return "{"+_resource+","+_contentType+","+_lastModifiedBytes+"}";
+ return String.format("%s %s %d %s %s",_resource,_resource.exists(),_resource.lastModified(),_contentType,_lastModifiedBytes);
}
}
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
index e59e7245db..596d930c76 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
@@ -187,7 +187,15 @@ public class ConnectHandler extends HandlerWrapper
if (HttpMethods.CONNECT.equalsIgnoreCase(request.getMethod()))
{
_logger.debug("CONNECT request for {}", request.getRequestURI());
- handleConnect(baseRequest, request, response, request.getRequestURI());
+ try
+ {
+ handleConnect(baseRequest, request, response, request.getRequestURI());
+ }
+ catch(Exception e)
+ {
+ _logger.warn("ConnectHandler "+baseRequest.getUri()+" "+ e);
+ _logger.debug(e);
+ }
}
else
{
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
index 2a318a6ce2..c0a3ea9398 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
@@ -566,6 +566,9 @@ public abstract class AbstractSessionManager extends AbstractLifeCycle implement
}
/* ------------------------------------------------------------ */
+ /**
+ * @see org.eclipse.jetty.server.SessionManager#setSessionPath(java.lang.String)
+ */
public void setSessionPath(String path)
{
_sessionPath=path;
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index db84275950..eee777ee17 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet</artifactId>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index d0b79e0b43..2a1d798d28 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlets</artifactId>
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 664dd6aecf..7478a7a588 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-start</artifactId>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index d1ada11c14..6842a4b8d4 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/OldQueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/OldQueuedThreadPool.java
deleted file mode 100644
index b68e1ae99f..0000000000
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/OldQueuedThreadPool.java
+++ /dev/null
@@ -1,612 +0,0 @@
-// ========================================================================
-// Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
-
-package org.eclipse.jetty.util.thread;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jetty.util.component.AbstractLifeCycle;
-import org.eclipse.jetty.util.log.Log;
-
-/* ------------------------------------------------------------ */
-/** A pool of threads.
- * <p>
- * Avoids the expense of thread creation by pooling threads after
- * their run methods exit for reuse.
- * <p>
- * If an idle thread is available a job is directly dispatched,
- * otherwise the job is queued. After queuing a job, if the total
- * number of threads is less than the maximum pool size, a new thread
- * is spawned.
- * <p>
- *
- */
-public class OldQueuedThreadPool extends AbstractLifeCycle implements Serializable, ThreadPool
-{
- private static int __id;
-
- private String _name;
- private Set _threads;
- private List _idle;
- private Runnable[] _jobs;
- private int _nextJob;
- private int _nextJobSlot;
- private int _queued;
- private int _maxQueued;
-
- private boolean _daemon;
- private int _id;
-
- private final Object _lock = new Lock();
- private final Object _threadsLock = new Lock();
- private final Object _joinLock = new Lock();
-
- private long _lastShrink;
- private int _maxIdleTimeMs=60000;
- private int _maxThreads=250;
- private int _minThreads=2;
- private boolean _warned=false;
- private int _lowThreads=0;
- private int _priority= Thread.NORM_PRIORITY;
- private int _spawnOrShrinkAt=0;
- private int _maxStopTimeMs;
-
-
- /* ------------------------------------------------------------------- */
- /* Construct
- */
- public OldQueuedThreadPool()
- {
- _name="qtp"+__id++;
- }
-
- /* ------------------------------------------------------------------- */
- /* Construct
- */
- public OldQueuedThreadPool(int maxThreads)
- {
- this();
- setMaxThreads(maxThreads);
- }
-
- /* ------------------------------------------------------------ */
- /** Run job.
- * @return true
- */
- public boolean dispatch(Runnable job)
- {
- if (!isRunning() || job==null)
- return false;
-
- PoolThread thread=null;
- boolean spawn=false;
-
- synchronized(_lock)
- {
- // Look for an idle thread
- int idle=_idle.size();
- if (idle>0)
- thread=(PoolThread)_idle.remove(idle-1);
- else
- {
- // queue the job
- _queued++;
- if (_queued>_maxQueued)
- _maxQueued=_queued;
- _jobs[_nextJobSlot++]=job;
- if (_nextJobSlot==_jobs.length)
- _nextJobSlot=0;
- if (_nextJobSlot==_nextJob)
- {
- // Grow the job queue
- Runnable[] jobs= new Runnable[_jobs.length+_maxThreads];
- int split=_jobs.length-_nextJob;
- if (split>0)
- System.arraycopy(_jobs,_nextJob,jobs,0,split);
- if (_nextJob!=0)
- System.arraycopy(_jobs,0,jobs,split,_nextJobSlot);
-
- _jobs=jobs;
- _nextJob=0;
- _nextJobSlot=_queued;
- }
-
- spawn=_queued>_spawnOrShrinkAt;
- }
- }
-
- if (thread!=null)
- {
- thread.dispatch(job);
- }
- else if (spawn)
- {
- newThread();
- }
- return true;
- }
-
- /* ------------------------------------------------------------ */
- /** Get the number of idle threads in the pool.
- * @see #getThreads
- * @return Number of threads
- */
- public int getIdleThreads()
- {
- return _idle==null?0:_idle.size();
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return low resource threads threshhold
- */
- public int getLowThreads()
- {
- return _lowThreads;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return maximum queue size
- */
- public int getMaxQueued()
- {
- return _maxQueued;
- }
-
- /* ------------------------------------------------------------ */
- /** Get the maximum thread idle time.
- * Delegated to the named or anonymous Pool.
- * @see #setMaxIdleTimeMs
- * @return Max idle time in ms.
- */
- public int getMaxIdleTimeMs()
- {
- return _maxIdleTimeMs;
- }
-
- /* ------------------------------------------------------------ */
- /** Set the maximum number of threads.
- * Delegated to the named or anonymous Pool.
- * @see #setMaxThreads
- * @return maximum number of threads.
- */
- public int getMaxThreads()
- {
- return _maxThreads;
- }
-
- /* ------------------------------------------------------------ */
- /** Get the minimum number of threads.
- * Delegated to the named or anonymous Pool.
- * @see #setMinThreads
- * @return minimum number of threads.
- */
- public int getMinThreads()
- {
- return _minThreads;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return The name of the BoundedThreadPool.
- */
- public String getName()
- {
- return _name;
- }
-
- /* ------------------------------------------------------------ */
- /** Get the number of threads in the pool.
- * @see #getIdleThreads
- * @return Number of threads
- */
- public int getThreads()
- {
- return _threads.size();
- }
-
- /* ------------------------------------------------------------ */
- /** Get the priority of the pool threads.
- * @return the priority of the pool threads.
- */
- public int getThreadsPriority()
- {
- return _priority;
- }
-
- /* ------------------------------------------------------------ */
- public int getQueueSize()
- {
- return _queued;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return the spawnOrShrinkAt The number of queued jobs (or idle threads) needed
- * before the thread pool is grown (or shrunk)
- */
- public int getSpawnOrShrinkAt()
- {
- return _spawnOrShrinkAt;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @param spawnOrShrinkAt The number of queued jobs (or idle threads) needed
- * before the thread pool is grown (or shrunk)
- */
- public void setSpawnOrShrinkAt(int spawnOrShrinkAt)
- {
- _spawnOrShrinkAt=spawnOrShrinkAt;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return maximum total time that stop() will wait for threads to die.
- */
- public int getMaxStopTimeMs()
- {
- return _maxStopTimeMs;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @param stopTimeMs maximum total time that stop() will wait for threads to die.
- */
- public void setMaxStopTimeMs(int stopTimeMs)
- {
- _maxStopTimeMs = stopTimeMs;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * Delegated to the named or anonymous Pool.
- */
- public boolean isDaemon()
- {
- return _daemon;
- }
-
- /* ------------------------------------------------------------ */
- public boolean isLowOnThreads()
- {
- return _queued>_lowThreads;
- }
-
- /* ------------------------------------------------------------ */
- public void join() throws InterruptedException
- {
- synchronized (_joinLock)
- {
- while (isRunning())
- _joinLock.wait();
- }
-
- // TODO remove this semi busy loop!
- while (isStopping())
- Thread.sleep(100);
- }
-
- /* ------------------------------------------------------------ */
- /**
- * Delegated to the named or anonymous Pool.
- */
- public void setDaemon(boolean daemon)
- {
- _daemon=daemon;
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @param lowThreads low resource threads threshhold
- */
- public void setLowThreads(int lowThreads)
- {
- _lowThreads = lowThreads;
- }
-
- /* ------------------------------------------------------------ */
- /** Set the maximum thread idle time.
- * Threads that are idle for longer than this period may be
- * stopped.
- * Delegated to the named or anonymous Pool.
- * @see #getMaxIdleTimeMs
- * @param maxIdleTimeMs Max idle time in ms.
- */
- public void setMaxIdleTimeMs(int maxIdleTimeMs)
- {
- _maxIdleTimeMs=maxIdleTimeMs;
- }
-
- /* ------------------------------------------------------------ */
- /** Set the maximum number of threads.
- * Delegated to the named or anonymous Pool.
- * @see #getMaxThreads
- * @param maxThreads maximum number of threads.
- */
- public void setMaxThreads(int maxThreads)
- {
- if (isStarted() && maxThreads<_minThreads)
- throw new IllegalArgumentException("!minThreads<maxThreads");
- _maxThreads=maxThreads;
- }
-
- /* ------------------------------------------------------------ */
- /** Set the minimum number of threads.
- * Delegated to the named or anonymous Pool.
- * @see #getMinThreads
- * @param minThreads minimum number of threads
- */
- public void setMinThreads(int minThreads)
- {
- if (isStarted() && (minThreads<=0 || minThreads>_maxThreads))
- throw new IllegalArgumentException("!0<=minThreads<maxThreads");
- _minThreads=minThreads;
- synchronized (_threadsLock)
- {
- while (isStarted() && _threads.size()<_minThreads)
- {
- newThread();
- }
- }
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @param name Name of the BoundedThreadPool to use when naming Threads.
- */
- public void setName(String name)
- {
- _name= name;
- }
-
- /* ------------------------------------------------------------ */
- /** Set the priority of the pool threads.
- * @param priority the new thread priority.
- */
- public void setThreadsPriority(int priority)
- {
- _priority=priority;
- }
-
- /* ------------------------------------------------------------ */
- /* Start the BoundedThreadPool.
- * Construct the minimum number of threads.
- */
- @Override
- protected void doStart() throws Exception
- {
- if (_maxThreads<_minThreads || _minThreads<=0)
- throw new IllegalArgumentException("!0<minThreads<maxThreads");
-
- _threads=new HashSet();
- _idle=new ArrayList();
- _jobs=new Runnable[_maxThreads];
-
- for (int i=0;i<_minThreads;i++)
- {
- newThread();
- }
- }
-
- /* ------------------------------------------------------------ */
- /** Stop the BoundedThreadPool.
- * New jobs are no longer accepted,idle threads are interrupted
- * and stopJob is called on active threads.
- * The method then waits
- * min(getMaxStopTimeMs(),getMaxIdleTimeMs()), for all jobs to
- * stop, at which time killJob is called.
- */
- @Override
- protected void doStop() throws Exception
- {
- super.doStop();
-
- long start=System.currentTimeMillis();
- for (int i=0;i<100;i++)
- {
- synchronized (_threadsLock)
- {
- Iterator iter = _threads.iterator();
- while (iter.hasNext())
- ((Thread)iter.next()).interrupt();
- }
-
- Thread.yield();
- if (_threads.size()==0 || (_maxStopTimeMs>0 && _maxStopTimeMs < (System.currentTimeMillis()-start)))
- break;
-
- try
- {
- Thread.sleep(i*100);
- }
- catch(InterruptedException e){}
-
-
- }
-
- // TODO perhaps force stops
- int size=_threads.size();
- if (size>0)
- Log.warn(size+" threads could not be stopped");
-
- synchronized (_joinLock)
- {
- _joinLock.notifyAll();
- }
- }
-
- /* ------------------------------------------------------------ */
- protected void newThread()
- {
- synchronized (_threadsLock)
- {
- if (_threads.size()<_maxThreads)
- {
- PoolThread thread =new PoolThread();
- _threads.add(thread);
- thread.setName(thread.getId()+"@"+_name+"-"+_id++);
- thread.start();
- }
- else if (!_warned)
- {
- _warned=true;
- Log.debug("Max threads for {}",this);
- }
- }
- }
-
- /* ------------------------------------------------------------ */
- /** Stop a Job.
- * This method is called by the Pool if a job needs to be stopped.
- * The default implementation does nothing and should be extended by a
- * derived thread pool class if special action is required.
- * @param thread The thread allocated to the job, or null if no thread allocated.
- * @param job The job object passed to run.
- */
- protected void stopJob(Thread thread, Object job)
- {
- thread.interrupt();
- }
-
-
- /* ------------------------------------------------------------ */
- /** Pool Thread class.
- * The PoolThread allows the threads job to be
- * retrieved and active status to be indicated.
- */
- public class PoolThread extends Thread
- {
- Runnable _job=null;
-
- /* ------------------------------------------------------------ */
- PoolThread()
- {
- setDaemon(_daemon);
- setPriority(_priority);
- }
-
- /* ------------------------------------------------------------ */
- /** BoundedThreadPool run.
- * Loop getting jobs and handling them until idle or stopped.
- */
- @Override
- public void run()
- {
- boolean idle=false;
- Runnable job=null;
- try
- {
- while (isRunning())
- {
- // Run any job that we have.
- if (job!=null)
- {
- final Runnable todo=job;
- job=null;
- idle=false;
- todo.run();
- }
-
- synchronized(_lock)
- {
- // is there a queued job?
- if (_queued>0)
- {
- _queued--;
- job=_jobs[_nextJob++];
- if (_nextJob==_jobs.length)
- _nextJob=0;
- continue;
- }
-
- // Should we shrink?
- final int threads=_threads.size();
- if (threads>_minThreads &&
- (threads>_maxThreads ||
- _idle.size()>_spawnOrShrinkAt))
- {
- long now = System.currentTimeMillis();
- if ((now-_lastShrink)>getMaxIdleTimeMs())
- {
- _lastShrink=now;
- _idle.remove(this);
- return;
- }
- }
-
- if (!idle)
- {
- // Add ourselves to the idle set.
- _idle.add(this);
- idle=true;
- }
- }
-
- // We are idle
- // wait for a dispatched job
- synchronized (this)
- {
- if (_job==null)
- this.wait(getMaxIdleTimeMs());
- job=_job;
- _job=null;
- }
- }
- }
- catch (InterruptedException e)
- {
- Log.ignore(e);
- }
- finally
- {
- synchronized (_lock)
- {
- _idle.remove(this);
- }
- synchronized (_threadsLock)
- {
- _threads.remove(this);
- }
- synchronized (this)
- {
- job=_job;
- }
-
- // we died with a job! reschedule it
- if (job!=null)
- {
- OldQueuedThreadPool.this.dispatch(job);
- }
- }
- }
-
- /* ------------------------------------------------------------ */
- void dispatch(Runnable job)
- {
- synchronized (this)
- {
- _job=job;
- this.notify();
- }
- }
- }
-
- private class Lock{}
-}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
index 444e73fdfb..0023571d58 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -33,8 +33,9 @@ import org.eclipse.jetty.util.component.AggregateLifeCycle;
import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool;
-public class QueuedThreadPool extends AbstractLifeCycle implements ThreadPool, Executor, Dumpable
+public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPool, Executor, Dumpable
{
private final AtomicInteger _threadsStarted = new AtomicInteger();
private final AtomicInteger _threadsIdle = new AtomicInteger();
@@ -489,7 +490,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements ThreadPool, E
}
else
{
- dump.add(thread.getId()+" "+thread.getName()+" "+thread.getState()+" @ "+trace[0]+(idle?" IDLE":""));
+ dump.add(thread.getId()+" "+thread.getName()+" "+thread.getState()+" @ "+(trace.length>0?trace[0]:"???")+(idle?" IDLE":""));
}
}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java
index d44790fb12..2a1e630820 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java
@@ -48,4 +48,15 @@ public interface ThreadPool
* @return True if the pool is low on threads
*/
public boolean isLowOnThreads();
+
+
+ /* ------------------------------------------------------------ */
+ /* ------------------------------------------------------------ */
+ public interface SizedThreadPool extends ThreadPool
+ {
+ public int getMinThreads();
+ public int getMaxThreads();
+ public void setMinThreads(int threads);
+ public void setMaxThreads(int threads);
+ }
}
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index e3920045e4..39cadea598 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-webapp</artifactId>
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 7d88f2137c..672327dca4 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 74bad3aac9..b81533e664 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-xml</artifactId>
diff --git a/pom.xml b/pom.xml
index 162d4396c8..cd8055a039 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
<name>Jetty :: Project</name>
<url>${jetty.url}</url>
<packaging>pom</packaging>
@@ -26,9 +26,9 @@
<jetty.test.policy>1.2</jetty.test.policy>
</properties>
<scm>
- <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>
- <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</developerConnection>
- <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</url>
+ <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.0.RC0</connection>
+ <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.0.RC0</developerConnection>
+ <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.0.RC0</url>
</scm>
<build>
<defaultGoal>install</defaultGoal>
diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml
index caa0f1aaf8..7bc842b8d5 100644
--- a/test-continuation-jetty6/pom.xml
+++ b/test-continuation-jetty6/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-continuation-jetty6</artifactId>
diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml
index edf6c877d7..66fbd6380e 100644
--- a/test-continuation/pom.xml
+++ b/test-continuation/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-continuation</artifactId>
diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml
index 4d8ca4f06f..f0d5054c75 100644
--- a/test-jetty-nested/pom.xml
+++ b/test-jetty-nested/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-jetty-nested</artifactId>
<name>Jetty :: Nested Test</name>
diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml
index 72f98b91f5..741b25d557 100644
--- a/test-jetty-servlet/pom.xml
+++ b/test-jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-jetty-servlet</artifactId>
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index 3b741c0c76..a4642bbc46 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
index b9761f0d58..5333683cbd 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index e3492c13cd..751a081595 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration</artifactId>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 5ffbe9349b..78ab56943e 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-loginservice</artifactId>
<name>Jetty Tests :: Login Service</name>
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 488b641fb4..2ee2780932 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-sessions-parent</artifactId>
<name>Jetty Tests :: Sessions :: Parent</name>
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index ba36b78ac9..6cdeca1c16 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-hash-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Hash</name>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 0017d86aee..4d0ceb8d23 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-jdbc-sessions</artifactId>
<name>Jetty Tests :: Sessions :: JDBC</name>
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index d6610d7563..2c14ce978b 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-sessions-common</artifactId>
<name>Jetty Tests :: Sessions :: Common</name>
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index 8d47d75456..ba4e13fdf9 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-webapps-parent</artifactId>
<name>Jetty Tests :: WebApps :: Parent</name>
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 443d30bf13..22f371c694 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-webapps-parent</artifactId>
- <version>7.4.0-SNAPSHOT</version>
+ <version>7.4.0.RC0</version>
</parent>
<artifactId>test-webapp-rfc2616</artifactId>
<name>Jetty Tests :: WebApp :: RFC2616</name>

Back to the top