Author: ogrisel
Date: Mon Apr 4 00:48:27 2011
New Revision: 1088456
URL: http://svn.apache.org/viewvc?rev=1088456&view=rev
Log:
STANBOL-120: better handling of missing cache provider
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java?rev=1088456&r1=1088455&r2=1088456&view=diff
==============================================================================
---
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java
(original)
+++
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java
Mon Apr 4 00:48:27 2011
@@ -27,6 +27,7 @@ import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -66,10 +67,15 @@ public class EnginesRootResource extends
jobManager =
ContextHelper.getServiceFromContext(EnhancementJobManager.class, context);
tcManager = ContextHelper.getServiceFromContext(TcManager.class,
context);
serializer = ContextHelper.getServiceFromContext(Serializer.class,
context);
- EntityCacheProvider entityCacheProvider =
ContextHelper.getServiceFromContext(
- EntityCacheProvider.class, context);
- if (entityCacheProvider != null) {
- entityCache = entityCacheProvider.getEntityCache();
+ entityCache = new SimpleMGraph().getGraph();
+ try {
+ EntityCacheProvider entityCacheProvider =
ContextHelper.getServiceFromContext(
+ EntityCacheProvider.class, context);
+ if (entityCacheProvider != null) {
+ entityCache = entityCacheProvider.getEntityCache();
+ }
+ } catch (NullPointerException e) {
+ // service lookup can raise null pointer exception, fall back to
empty cache
}
}