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

Specify character encoding for file I/O.

Browse Source
This commit is contained in:
takezoe
2013-04-27 03:59:21 +09:00
parent ebc2febda7
commit dba9a2f7ec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/util/AutoUpdate.scala
View File

@@ -28,7 +28,7 @@ object AutoUpdate {
val sqlPath = "update/%d_%d.sql".format(majorVersion, minorVersion) val sqlPath = "update/%d_%d.sql".format(majorVersion, minorVersion)
val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath) val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)
if(in != null){ if(in != null){
val sql = IOUtils.toString(in) val sql = IOUtils.toString(in, "UTF-8")
val stmt = conn.createStatement() val stmt = conn.createStatement()
try { try {
logger.debug(sqlPath + "=" + sql) logger.debug(sqlPath + "=" + sql)
@@ -67,7 +67,7 @@ object AutoUpdate {
*/ */
def getCurrentVersion(): Version = { def getCurrentVersion(): Version = {
if(versionFile.exists){ if(versionFile.exists){
FileUtils.readFileToString(versionFile).split("\\.") match { FileUtils.readFileToString(versionFile, "UTF-8").split("\\.") match {
case Array(majorVersion, minorVersion) => { case Array(majorVersion, minorVersion) => {
versions.find { v => versions.find { v =>
v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
@@ -102,7 +102,7 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
logger.debug("No update") logger.debug("No update")
} else { } else {
versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn)) versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
FileUtils.writeStringToFile(versionFile, headVersion.majorVersion + "." + headVersion.minorVersion) FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
conn.commit() conn.commit()
logger.debug("Updated from " + currentVersion.versionString + " to " + headVersion.versionString) logger.debug("Updated from " + currentVersion.versionString + " to " + headVersion.versionString)
} }