Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-03-03 06:43:25 +0000
committerGreg Wilkins2011-03-03 06:43:25 +0000
commit8b1920859cc217d3c1a3a12a31e3658771ec8fa0 (patch)
tree9fe7fa9bfdeb55483613549706013189f483c824
parent7b0a8e561cbe4dbd5d3e08b434d65fc984aaa436 (diff)
downloadorg.eclipse.jetty.project-8b1920859cc217d3c1a3a12a31e3658771ec8fa0.tar.gz
org.eclipse.jetty.project-8b1920859cc217d3c1a3a12a31e3658771ec8fa0.tar.xz
org.eclipse.jetty.project-8b1920859cc217d3c1a3a12a31e3658771ec8fa0.zip
JETTY-1337 Workname cannot contain .
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2848 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 5988485ada..8782f8b06f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -26,6 +26,7 @@ jetty-7.3.1-SNAPSHOT
+ JETTY-1331 Allow alternate XML configuration processors (eg spring)
+ JETTY-1335 HttpClient's SelectConnector clean-up
+ JETTY-1333 HttpClient _timeout and _soTimeout is messed up
+ + JETTY-1337 Workname cannot contain '.'
jetty-7.3.0.v20110203 3 February 2011
+ JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating session (further update)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
index 63a8ac72a2..ed4d19ca7e 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
@@ -63,6 +63,8 @@ public abstract class AbstractSessionIdManager extends AbstractLifeCycle impleme
*/
public void setWorkerName(String workerName)
{
+ if (workerName.contains("."))
+ throw new IllegalArgumentException("Name cannot contain '.'");
_workerName=workerName;
}

Back to the top