With the latest kernel-caching looks like the contract was changed by adding a few 'throws Exception' declarations on methods.
Now portal build fails for me. To get the build to pass I had to catch the exceptions in a few places (exception handling not necessarily appropriate):
Index: component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java (revision 981)
+++ component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java (working copy)
@@ -96,7 +96,14 @@
{
throw new IllegalStateException("Cannot read object in shared cache from a modified session");
}
- return mgr.cache.get(key);
+ try
+ {
+ return mgr.cache.get(key);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Exception while getting from cache: ", e);
+ }
}
public void putInCache(Serializable key, Object value)
@@ -105,7 +112,14 @@
{
throw new IllegalStateException("Cannot put object in shared cache from a modified session");
}
- mgr.cache.put(key, value);
+ try
+ {
+ mgr.cache.put(key, value);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Exception while putting into cache: ", e);
+ }
}
public void scheduleForEviction(Serializable key)
@@ -407,7 +421,13 @@
{
for (Serializable key : staleKeys)
{
- mgr.cache.remove(key);
+ try
+ {
+ mgr.cache.remove(key);
+ }
+ catch (Exception ignored)
+ {
+ }
}
}
}
Index: component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java
===================================================================
--- component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java (revision 981)
+++ component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java (working copy)
@@ -95,7 +95,14 @@
public void clearCache()
{
- cache.clearCache();
+ try
+ {
+ cache.clearCache();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to clear cache: ", e);
+ }
}
public MOPService getPOMService()
Index: component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
===================================================================
--- component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java (revision 981)
+++ component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java (working copy)
@@ -266,7 +266,14 @@
*/
protected final void invalidate(String name)
{
- cache_.remove(name);
+ try
+ {
+ cache_.remove(name);
+ }
+ catch (Exception ex)
+ {
+ log_.warn("Failed to invalidate entry: " + name, ex);
+ }
}
public ResourceBundle getResourceBundle(String name, Locale locale, ClassLoader cl)
Cheers,
- marko