ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !184 from Hacker/N/A

This commit is contained in:
Hacker 2020-12-16 10:07:59 +08:00 committed by Gitee
parent bda12d5016 c958cf5c7c
commit 52d289e858
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
View File

@ -150,10 +150,8 @@ public class ShiroConfig
protected InputStream getCacheManagerConfigFileInputStream() protected InputStream getCacheManagerConfigFileInputStream()
{ {
String configFile = "classpath:ehcache/ehcache-shiro.xml"; String configFile = "classpath:ehcache/ehcache-shiro.xml";
InputStream inputStream = null; try (InputStream inputStream = ResourceUtils.getInputStreamForPath(configFile))
try
{ {
inputStream = ResourceUtils.getInputStreamForPath(configFile);
byte[] b = IOUtils.toByteArray(inputStream); byte[] b = IOUtils.toByteArray(inputStream);
InputStream in = new ByteArrayInputStream(b); InputStream in = new ByteArrayInputStream(b);
return in; return in;
@ -163,10 +161,6 @@ public class ShiroConfig
throw new ConfigurationException( throw new ConfigurationException(
"Unable to obtain input stream for cacheManagerConfigFile [" + configFile + "]", e); "Unable to obtain input stream for cacheManagerConfigFile [" + configFile + "]", e);
} }
finally
{
IOUtils.closeQuietly(inputStream);
}
} }
/** /**