You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by co...@apache.org on 2020/01/03 12:02:29 UTC
[shiro] branch master updated: A few trivial fixes (#189)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 80631e7 A few trivial fixes (#189)
80631e7 is described below
commit 80631e7374645bfaab6b5cf0d40a115fe122d9b9
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Fri Jan 3 12:02:14 2020 +0000
A few trivial fixes (#189)
---
.../src/main/java/org/apache/shiro/crypto/JcaCipherService.java | 4 ++--
.../main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java | 2 +-
web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/crypto/cipher/src/main/java/org/apache/shiro/crypto/JcaCipherService.java b/crypto/cipher/src/main/java/org/apache/shiro/crypto/JcaCipherService.java
index b305b02..a308471 100644
--- a/crypto/cipher/src/main/java/org/apache/shiro/crypto/JcaCipherService.java
+++ b/crypto/cipher/src/main/java/org/apache/shiro/crypto/JcaCipherService.java
@@ -306,7 +306,7 @@ public abstract class JcaCipherService implements CipherService {
if (generate) {
ivBytes = generateInitializationVector(false);
if (ivBytes == null || ivBytes.length == 0) {
- throw new IllegalStateException("Initialization vector generation is enabled - generated vector" +
+ throw new IllegalStateException("Initialization vector generation is enabled - generated vector " +
"cannot be null or empty.");
}
}
@@ -503,7 +503,7 @@ public abstract class JcaCipherService implements CipherService {
if (generate) {
iv = generateInitializationVector(true);
if (iv == null || iv.length == 0) {
- throw new IllegalStateException("Initialization vector generation is enabled - generated vector" +
+ throw new IllegalStateException("Initialization vector generation is enabled - generated vector " +
"cannot be null or empty.");
}
}
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java b/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
index c0010bd..8f0d5bb 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
@@ -314,7 +314,7 @@ public abstract class AbstractShiroFilter extends OncePerRequestFilter {
try {
session.touch();
} catch (Throwable t) {
- log.error("session.touch() method invocation has failed. Unable to update" +
+ log.error("session.touch() method invocation has failed. Unable to update " +
"the corresponding session's last access time based on the incoming request.", t);
}
}
diff --git a/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java b/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java
index 022036a..4aa607b 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java
@@ -107,7 +107,7 @@ public class ShiroHttpSession implements HttpSession {
public void setMaxInactiveInterval(int i) {
try {
- getSession().setTimeout(i * 1000);
+ getSession().setTimeout(i * 1000L);
} catch (InvalidSessionException e) {
throw new IllegalStateException(e);
}