[hibernate-commits] Hibernate SVN: r10717 - in trunk/Hibernate3: lib src/org/hibernate/cache
Author: max.andersen(a)jboss.com
Date: 2006-11-03 14:05:21 -0500 (Fri, 03 Nov 2006)
New Revision: 10717
Added:
trunk/Hibernate3/lib/ehcache-1.2.3.jar
Modified:
trunk/Hibernate3/lib/version.properties
trunk/Hibernate3/src/org/hibernate/cache/EhCache.java
Log:
HHH-2209 ehcache.jar is old and does not contain the SingletonCacheProvider which are
advised in exception messages
Added: trunk/Hibernate3/lib/ehcache-1.2.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Hibernate3/lib/ehcache-1.2.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Hibernate3/lib/version.properties
===================================================================
--- trunk/Hibernate3/lib/version.properties 2006-11-03 19:05:11 UTC (rev 10716)
+++ trunk/Hibernate3/lib/version.properties 2006-11-03 19:05:21 UTC (rev 10717)
@@ -159,8 +159,8 @@
## cache providers
-ehcache.lib=ehcache-1.2.jar
-ehcache.version=1.2
+ehcache.lib=ehcache-1.2.3.jar
+ehcache.version=1.2.3
ehcache.name=EHCache cache
ehcache.when=runtime, optional (required if no other cache provider is set)
Modified: trunk/Hibernate3/src/org/hibernate/cache/EhCache.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/cache/EhCache.java 2006-11-03 19:05:11 UTC (rev
10716)
+++ trunk/Hibernate3/src/org/hibernate/cache/EhCache.java 2006-11-03 19:05:21 UTC (rev
10717)
@@ -124,6 +124,9 @@
catch (IllegalStateException e) {
throw new CacheException( e );
}
+ catch (net.sf.ehcache.CacheException e) {
+ throw new CacheException( e );
+ }
}
@@ -145,6 +148,9 @@
catch (IllegalStateException e) {
throw new CacheException( e );
}
+ catch (net.sf.ehcache.CacheException e) {
+ throw new CacheException( e );
+ }
}
/**
@@ -160,7 +166,7 @@
catch (IllegalStateException e) {
throw new CacheException( e );
}
- catch (IOException e) {
+ catch (net.sf.ehcache.CacheException e) {
throw new CacheException( e );
}
}