A few trivial fixes (#189)

apache · Jan 3, 2020 · 80631e7 · 80631e7
1 parent a3f88de
commit 80631e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -306,7 +306,7 @@ public ByteSource encrypt(byte[] plaintext, byte[] key) {
         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 void encrypt(InputStream in, OutputStream out, byte[] key) throws CryptoE
         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
@@ -314,7 +314,7 @@ protected void updateSessionLastAccessTime(ServletRequest request, ServletRespon
                     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
@@ -107,7 +107,7 @@ public ServletContext getServletContext() {
 
     public void setMaxInactiveInterval(int i) {
         try {
-            getSession().setTimeout(i * 1000);
+            getSession().setTimeout(i * 1000L);
         } catch (InvalidSessionException e) {
             throw new IllegalStateException(e);
         }