[roller] 06/09: exception handling / logging.

[mb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git

commit b4985671aa7a4c097bb742caa2473ae0451c2fa6
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Tue May 18 03:02:04 2021 +0200

    exception handling / logging.
---
 .../ui/rendering/velocity/RollerResourceLoader.java |  9 ++++-----
 .../rendering/velocity/VelocityRendererFactory.java | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
index e81bf06..4159c64 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
@@ -46,7 +46,7 @@ import org.apache.velocity.util.ExtProperties;
  */
 public class RollerResourceLoader extends ResourceLoader {
 
-	private static Log logger = LogFactory.getLog(RollerResourceLoader.class);
+	private static final Log logger = LogFactory.getLog(RollerResourceLoader.class);
 
     @Override
 	public void init(ExtProperties configuration) {
@@ -105,15 +105,14 @@ public class RollerResourceLoader extends ResourceLoader {
 		} catch (UnsupportedEncodingException uex) {
 			// This should never actually happen. We expect UTF-8 in all JRE
 			// installation.
-			// This rethrows as a Runtime exception after logging.
-			logger.error(uex);
+//			logger.error(uex);
 			throw new RuntimeException(uex);
 
 		} catch (WebloggerException | ResourceNotFoundException re) {
 			String msg = "RollerResourceLoader Error: "
 					+ "database problem trying to load resource " + name;
-			logger.error(msg, re);
-			throw new ResourceNotFoundException(msg);
+//			logger.error(msg, re);
+			throw new ResourceNotFoundException(msg, re);
 		}
 	}
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRendererFactory.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRendererFactory.java
index 631f573..62f55d2 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRendererFactory.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRendererFactory.java
@@ -28,44 +28,45 @@ import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
 import org.apache.roller.weblogger.ui.rendering.Renderer;
 import org.apache.roller.weblogger.ui.rendering.RendererFactory;
 import org.apache.roller.weblogger.ui.rendering.mobile.MobileDeviceRepository;
+import org.apache.velocity.exception.ResourceNotFoundException;
 
 
 /**
  * RendererFactory for Velocity, creates VelocityRenderers.
  */
 public class VelocityRendererFactory implements RendererFactory {
-    private static Log log = LogFactory.getLog(VelocityRendererFactory.class);
+    private static final Log log = LogFactory.getLog(VelocityRendererFactory.class);
     
     @Override
     public Renderer getRenderer(Template template, 
 			MobileDeviceRepository.DeviceType deviceType) {
-        Renderer renderer = null;
-        TemplateRendition tr;
 
+        // nothing we can do with null values
         if (template == null || template.getId() == null) {
             return null;
         }
 
-        // nothing we can do with null values
+        TemplateRendition tr;
         try {
             tr = template.getTemplateRendition(RenditionType.STANDARD);
+            if (tr == null) {
+                return null;
+            }
         } catch (WebloggerException e) {
             return null;
         }
 
-        if (tr == null) {
-            return null;
-        }
+        Renderer renderer = null;
         
         if (TemplateLanguage.VELOCITY.equals(tr.getTemplateLanguage())) {
             // standard velocity template
             try {
                renderer = new VelocityRenderer(template, deviceType);
+            } catch (ResourceNotFoundException ex) {
+                // allready logged in VelocityRenderer
             } catch(Exception ex) {
-				log.error("ERROR creating VelocityRenderer", ex);
                 // some kind of exception so we don't have a renderer
-                // we do catching/logging in VelocityRenderer constructor
-                return null;
+				log.error("ERROR creating VelocityRenderer", ex);
             }            
         }
         return renderer;