tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#131: Close version file stream

This commit is contained in:
Taro L. Saito 2016-01-22 18:34:10 +09:00
parent 1198363176
commit e029c0e560
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/xerial/snappy/Snappy.java
View File

@ -25,6 +25,7 @@
package org.xerial.snappy;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.nio.ByteBuffer;
@ -282,19 +283,27 @@ public class Snappy
*/
public static String getNativeLibraryVersion()
{
URL versionFile = SnappyLoader.class.getResource("/org/xerial/snappy/VERSION");
String version = "unknown";
try {
if (versionFile != null) {
Properties versionData = new Properties();
versionData.load(versionFile.openStream());
version = versionData.getProperty("version", version);
if (version.equals("unknown")) {
version = versionData.getProperty("VERSION", version);
InputStream in = null;
try {
Properties versionData = new Properties();
in = versionFile.openStream();
versionData.load(in);
version = versionData.getProperty("version", version);
if (version.equals("unknown")) {
version = versionData.getProperty("VERSION", version);
}
version = version.trim().replaceAll("[^0-9\\.]", "");
}
finally {
if(in != null) {
in.close();
}
}
version = version.trim().replaceAll("[^0-9\\.]", "");
}
}
catch (IOException e) {