From 4ad2ddd43e965c33e16c42fbb0caa55337cb5271 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 16 Feb 2010 04:15:28 +0000 Subject: [PATCH] JETTY-1179 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1269 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../jetty/server/session/JDBCSessionIdManager.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index a5cdf7b7616..0676e4d5f35 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -28,6 +28,7 @@ jetty-7.0.2-SNAPSHOT + JETTY-1156 SSL blocking close with JVM Bug busy key fix + JETTY-1157 Don't hold array passed in write(byte[]) + JETTY-1177 Allow error handler to set cacheControl + + JETTY-1179 Persistant session tables created on MySQL use wrong datatype + COMETD-46 reset ContentExchange response content on resend jetty-7.0.1.v20091125 25 November 2009 diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java index 28a3d832fe5..4014684b6ff 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java @@ -63,7 +63,7 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager protected TimerTask _task; //scavenge task protected long _lastScavengeTime; protected long _scavengeIntervalMs = 1000 * 60 * 10; //10mins - + protected String _blobType; //if not set, is deduced from the type of the database at runtime protected String _createSessionIdTable; protected String _createSessionTable; @@ -125,6 +125,9 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager public String getBlobType () { + if (_blobType != null) + return _blobType; + if (_dbName.startsWith("postgres")) return "bytea"; @@ -189,6 +192,15 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager return _jndiName; } + public void setBlobType (String name) + { + _blobType = name; + } + + public String getBlobType () + { + return _blobType; + } public void setScavengeInterval (long sec) {