Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-03-03 06:55:25 +0000
committerGreg Wilkins2011-03-03 06:55:25 +0000
commite844b82b7051ece465da1ab84b2f265262735836 (patch)
tree9ef69bc3ffd83952c942bb81be5152bff53e0845
parent8b1920859cc217d3c1a3a12a31e3658771ec8fa0 (diff)
downloadorg.eclipse.jetty.project-e844b82b7051ece465da1ab84b2f265262735836.tar.gz
org.eclipse.jetty.project-e844b82b7051ece465da1ab84b2f265262735836.tar.xz
org.eclipse.jetty.project-e844b82b7051ece465da1ab84b2f265262735836.zip
JETTY-1338 Trust default SecureRandom seed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2849 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 8782f8b06f..90c8ee731d 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -27,6 +27,7 @@ jetty-7.3.1-SNAPSHOT
+ JETTY-1335 HttpClient's SelectConnector clean-up
+ JETTY-1333 HttpClient _timeout and _soTimeout is messed up
+ JETTY-1337 Workname cannot contain '.'
+ + JETTY-1338 Trust default SecureRandom seed
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 ed4d19ca7e..d690e5c91c 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
@@ -169,7 +169,8 @@ public abstract class AbstractSessionIdManager extends AbstractLifeCycle impleme
_weakRandom=true;
}
}
- _random.setSeed(_random.nextLong()^System.currentTimeMillis()^hashCode()^Runtime.getRuntime().freeMemory());
+ else
+ _random.setSeed(_random.nextLong()^System.currentTimeMillis()^hashCode()^Runtime.getRuntime().freeMemory());
}

Back to the top