Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 16:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add null check

Browse Source
This commit is contained in:
Naoki Takezoe
2017-07-25 12:35:41 +09:00
parent 5b245978d4
commit 2a83c1b9ba
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/servlet/InitializeListener.scala
View File

@@ -134,6 +134,7 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
val cl = Thread.currentThread.getContextClassLoader val cl = Thread.currentThread.getContextClassLoader
try { try {
using(cl.getResourceAsStream("plugins/plugins.json")){ pluginsFile => using(cl.getResourceAsStream("plugins/plugins.json")){ pluginsFile =>
if(pluginsFile != null){
val pluginsJson = IOUtils.toString(pluginsFile, "UTF-8") val pluginsJson = IOUtils.toString(pluginsFile, "UTF-8")
FileUtils.forceMkdir(PluginRepository.LocalRepositoryDir) FileUtils.forceMkdir(PluginRepository.LocalRepositoryDir)
@@ -156,6 +157,7 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
} }
} }
} }
}
} catch { } catch {
case e: Exception => logger.error("Error in extracting bundled plugin", e) case e: Exception => logger.error("Error in extracting bundled plugin", e)
} }