Do not serialize the Logger instance

Change-Id: Icbef95e95d05fa8d7dbdc750241252d291083820

diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index 647a9388e128931a6a453818968acc0761cc78f0..ec84df652d4285ca274491ede76915e5c56ca088 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -65,22 +65,27 @@ import com.gitblit.wicket.WicketUtils;
 \r
 public abstract class BasePage extends SessionPage {\r
 \r
-       private final Logger logger;\r
+       private transient Logger logger;\r
 \r
        private transient TimeUtils timeUtils;\r
 \r
        public BasePage() {\r
                super();\r
-               logger = LoggerFactory.getLogger(getClass());\r
                customizeHeader();\r
        }\r
 \r
        public BasePage(PageParameters params) {\r
                super(params);\r
-               logger = LoggerFactory.getLogger(getClass());\r
                customizeHeader();\r
        }\r
 \r
+       protected Logger logger() {\r
+               if (logger == null) {\r
+                       logger = LoggerFactory.getLogger(getClass());\r
+               }\r
+               return logger;\r
+       }\r
+\r
        private void customizeHeader() {\r
                if (app().settings().getBoolean(Keys.web.useResponsiveLayout, true)) {\r
                        add(CSSPackageResource.getHeaderContribution("bootstrap/css/bootstrap-responsive.css"));\r
@@ -171,7 +176,7 @@ public abstract class BasePage extends SessionPage {
                        case NONE:\r
                                break;\r
                        default:\r
-                               logger.warn(getClass().getSimpleName() + ": unhandled LastModified type " + cacheControl.value());\r
+                               logger().warn(getClass().getSimpleName() + ": unhandled LastModified type " + cacheControl.value());\r
                                break;\r
                        }\r
                }\r
@@ -411,7 +416,7 @@ public abstract class BasePage extends SessionPage {
        }\r
 \r
        public void warn(String message, Throwable t) {\r
-               logger.warn(message, t);\r
+               logger().warn(message, t);\r
        }\r
 \r
        public void error(String message, boolean redirect) {\r
@@ -428,9 +433,9 @@ public abstract class BasePage extends SessionPage {
 \r
        public void error(String message, Throwable t, Class<? extends Page> toPage, PageParameters params) {\r
                if (t == null) {\r
-                       logger.error(message  + " for " + GitBlitWebSession.get().getUsername());\r
+                       logger().error(message  + " for " + GitBlitWebSession.get().getUsername());\r
                } else {\r
-                       logger.error(message  + " for " + GitBlitWebSession.get().getUsername(), t);\r
+                       logger().error(message  + " for " + GitBlitWebSession.get().getUsername(), t);\r
                }\r
                if (toPage != null) {\r
                        GitBlitWebSession.get().cacheErrorMessage(message);\r
@@ -443,7 +448,7 @@ public abstract class BasePage extends SessionPage {
        }\r
 \r
        public void authenticationError(String message) {\r
-               logger.error(getRequest().getURL() + " for " + GitBlitWebSession.get().getUsername());\r
+               logger().error(getRequest().getURL() + " for " + GitBlitWebSession.get().getUsername());\r
                if (!GitBlitWebSession.get().isLoggedIn()) {\r
                        // cache the request if we have not authenticated.\r
                        // the request will continue after authentication.\r