Author: rwesten
Date: Mon Mar 2 11:28:12 2015
New Revision: 1663263
URL: http://svn.apache.org/r1663263
Log:
merged fix for STANBOL-1413 to trunk
Modified:
stanbol/trunk/commons/ (props changed)
stanbol/trunk/commons/freemarker/src/main/java/org/apache/stanbol/commons/freemarker/impl/BundleTemplateLoader.java
stanbol/trunk/commons/web/viewable-writer/src/main/java/org/apache/stanbol/commons/viewable/writer/impl/ViewableWriter.java
Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 2 11:28:12 2015
@@ -1,2 +1,2 @@
-/stanbol/branches/release-0.12/commons:1572583,1572588,1589341,1595158,1596518,1597561,1598019,1599433,1599973
+/stanbol/branches/release-0.12/commons:1572583,1572588,1589341,1595158,1596518,1597561,1598019,1599433,1599973,1626979
/stanbol/trunk/commons:1487448-1496831
Modified:
stanbol/trunk/commons/freemarker/src/main/java/org/apache/stanbol/commons/freemarker/impl/BundleTemplateLoader.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/freemarker/src/main/java/org/apache/stanbol/commons/freemarker/impl/BundleTemplateLoader.java?rev=1663263&r1=1663262&r2=1663263&view=diff
==============================================================================
---
stanbol/trunk/commons/freemarker/src/main/java/org/apache/stanbol/commons/freemarker/impl/BundleTemplateLoader.java
(original)
+++
stanbol/trunk/commons/freemarker/src/main/java/org/apache/stanbol/commons/freemarker/impl/BundleTemplateLoader.java
Mon Mar 2 11:28:12 2015
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* This Service provides an {@link TemplateLoader} that provides templates
* relative to the {@link #TEMPLATES_PATH_IN_BUNDLES}.
*/
-@Component
+@Component(immediate=true)
@Service(TemplateLoader.class)
public class BundleTemplateLoader implements TemplateLoader{
@@ -113,8 +113,22 @@ public class BundleTemplateLoader implem
context.getBundleContext().removeBundleListener(bundleListener);
}
- private boolean containsTemplates(Bundle bundle) {
- return bundle.getResource(TEMPLATES_PATH_IN_BUNDLES) != null;
- }
+ private boolean containsTemplates(Bundle bundle) {
+ try {
+ return bundle.getResource(TEMPLATES_PATH_IN_BUNDLES) != null;
+ } catch(NullPointerException e){
+ //sometimes this call caused a
+ //java.lang.NullPointerException
+ // at
org.apache.felix.framework.BundleRevisionImpl.getResourceLocal(BundleRevisionImpl.java:495)
+ // at
org.apache.felix.framework.BundleWiringImpl.findClassOrResourceByDelegation(BundleWiringImpl.java:1472)
+ // at
org.apache.felix.framework.BundleWiringImpl.getResourceByDelegation(BundleWiringImpl.java:1400)
+ // at
org.apache.felix.framework.Felix.getBundleResource(Felix.java:1600)
+ // at
org.apache.felix.framework.BundleImpl.getResource(BundleImpl.java:639)
+ // at
org.apache.stanbol.commons.freemarker.impl.BundleTemplateLoader.containsTemplates(BundleTemplateLoader.java:117)
+ log.warn(" ... unable to check for Path "+TEMPLATES_PATH_IN_BUNDLES
+ +" in Bundle "+ bundle, e);
+ return false;
+ }
+ }
}
Modified:
stanbol/trunk/commons/web/viewable-writer/src/main/java/org/apache/stanbol/commons/viewable/writer/impl/ViewableWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable-writer/src/main/java/org/apache/stanbol/commons/viewable/writer/impl/ViewableWriter.java?rev=1663263&r1=1663262&r2=1663263&view=diff
==============================================================================
---
stanbol/trunk/commons/web/viewable-writer/src/main/java/org/apache/stanbol/commons/viewable/writer/impl/ViewableWriter.java
(original)
+++
stanbol/trunk/commons/web/viewable-writer/src/main/java/org/apache/stanbol/commons/viewable/writer/impl/ViewableWriter.java
Mon Mar 2 11:28:12 2015
@@ -42,7 +42,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-@Component
+@Component(immediate=true)
@Service(Object.class)
@Property(name = "javax.ws.rs", boolValue = true)
@Produces(MediaType.TEXT_HTML)
