diff --git a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java index 44f91d2a7..d0f056bde 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java @@ -46,8 +46,8 @@ import org.apache.ofbiz.common.email.NotificationServices; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.security.Security; import org.apache.ofbiz.service.DispatchContext; -import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.GenericServiceException; +import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.widget.model.ThemeFactory; import org.apache.ofbiz.widget.renderer.ScreenRenderer; @@ -90,6 +90,9 @@ public class BirtEmailServices { String birtImageDirectory = (String) serviceContext.remove(BirtWorker.getBirtImageDirectory()); String birtContentType = (String) serviceContext.remove(BirtWorker.getBirtContentType()); VisualTheme visualTheme = (VisualTheme) context.get("visualTheme"); + if (visualTheme == null) { + visualTheme = ThemeFactory.resolveVisualTheme(null); + } if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null); if (bodyParameters == null) { bodyParameters = MapStack.create(); diff --git a/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java b/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java index 37411beab..886e9b24c 100644 --- a/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java +++ b/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java @@ -69,6 +69,9 @@ public class ExamplePrintServices { String screenLocation = "component://example/widget/example/ExampleReportScreens.xml"; String reportScreenName = "ExampleReport"; VisualTheme visualTheme = (VisualTheme) context.get("visualTheme"); + if (visualTheme == null) { + visualTheme = ThemeFactory.resolveVisualTheme(null); + } if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null); Map workContext = new HashMap(); workContext.putAll(context);