roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [roller] branch roller-5.2.x updated: Minor working and formatting changes.
Date Sun, 26 May 2019 13:10:20 GMT
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-5.2.x by this push:
     new db21732  Minor working and formatting changes.
db21732 is described below

commit db217320b6ab61c2b0b0002f74103763178777ae
Author: snoopdave@gmail.com <snoopdave@gmail.com>
AuthorDate: Sun May 26 09:08:31 2019 -0400

    Minor working and formatting changes.
---
 .../main/java/org/apache/roller/weblogger/ui/core/RollerContext.java  | 2 --
 .../ui/core/security/RollerRememberMeAuthenticationProvider.java      | 2 +-
 .../roller/weblogger/ui/core/security/RollerRememberMeServices.java   | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
index 1acc7f4..b4862dd 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
@@ -236,9 +236,7 @@ public class RollerContext extends ContextLoaderListener
 
         String rememberMe = WebloggerConfig.getProperty("rememberme.enabled");
         boolean rememberMeEnabled = Boolean.valueOf(rememberMe);
-
         log.info("Remember Me enabled: " + rememberMeEnabled);
-
         context.setAttribute("rememberMeEnabled", rememberMe);
 
         if (!rememberMeEnabled) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
index a847abc..7c8b60c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeAuthenticationProvider.java
@@ -36,7 +36,7 @@ public class RollerRememberMeAuthenticationProvider extends RememberMeAuthentica
         if ("springRocks".equals(key)) {
             throw new RuntimeException(
                 "If remember-me is to be enabled, rememberme.key must be specified in the
roller " +
-                "properties file. Make sure it is a secret and make sure it is NOT be springRocks");
+                "properties file. Make sure it is a secret and make sure it is NOT springRocks");
         }
         setKey(key);
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
index 608d752..ec70518 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
@@ -41,11 +41,11 @@ public class RollerRememberMeServices extends TokenBasedRememberMeServices
{
         if ("springRocks".equals(key)) {
             throw new RuntimeException(
                 "If remember-me is to be enabled, rememberme.key must be specified in the
roller " +
-                    "properties file. Make sure it is a secret and make sure it is NOT be
springRocks");
+                    "properties file. Make sure it is a secret and make sure it is NOT springRocks");
         }
         setKey(key);
 
-        log.debug("initialized: RollerRememberMeServices with key: " + getKey());
+        log.debug("initialized: RollerRememberMeServices with key");
     }
 
     /**


Mime
View raw message