Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-03 20:15:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix IllegalStateException when returning unknown avatar image (#3158)

Browse Source
This commit is contained in:
Naoki Takezoe
2022-10-08 11:24:03 +09:00
committed by GitHub
parent 9b8016a4d5
commit a0be02ce2f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -1,7 +1,6 @@
package gitbucket.core.controller package gitbucket.core.controller
import java.io.File import java.io.File
import gitbucket.core.account.html import gitbucket.core.account.html
import gitbucket.core.helper import gitbucket.core.helper
import gitbucket.core.model._ import gitbucket.core.model._
@@ -13,11 +12,14 @@ import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._ import gitbucket.core.util.Implicits._
import gitbucket.core.util.StringUtil._ import gitbucket.core.util.StringUtil._
import gitbucket.core.util._ import gitbucket.core.util._
import org.apache.commons.io.IOUtils
import org.scalatra.i18n.Messages import org.scalatra.i18n.Messages
import org.scalatra.BadRequest import org.scalatra.BadRequest
import org.scalatra.forms._ import org.scalatra.forms._
import org.scalatra.Forbidden import org.scalatra.Forbidden
import scala.util.Using
class AccountController class AccountController
extends AccountControllerBase extends AccountControllerBase
with AccountService with AccountService
@@ -332,7 +334,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
} }
.getOrElse { .getOrElse {
response.setHeader("Cache-Control", "max-age=3600") response.setHeader("Cache-Control", "max-age=3600")
Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png") Using.resource(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")) { in =>
IOUtils.toByteArray(in)
}
} }
} }