ZhouXY108
/
fastdfs-client-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from mengpengfei/master 

//问题说明 使用中发现原来客户端打jar包后，在另一个项目中引用，另一个项目打jar包后运行时找不到客户端配置文件
dev
YuQing 2017-04-17 09:20:55 +08:00 committed by GitHub
parent 7332ac55a9 560e831f0b
commit 10811b3f41
1 changed files with 72 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/org/csource/common/IniFileReader.java
View File

@ -128,38 +128,45 @@ public class IniFileReader
private void loadFromFile(String conf_filename) throws FileNotFoundException, IOException private void loadFromFile(String conf_filename) throws FileNotFoundException, IOException
{ {
FileReader fReader; //修改人 孟鹏飞，问题说明 使用中发现原来客户端打jar包后，在另一个项目中引用，另一个项目打jar包后运行时找不到客户端配置文件 ，能不能把我名字加上，以后好找工作
BufferedReader buffReader; // FileReader fReader;
String line; // BufferedReader buffReader;
String[] parts; // String line;
// String[] parts;
String name; String name;
String value; String value;
Object obj; Object obj;
ArrayList valueList; ArrayList valueList;
InputStream is=null;
fReader = new FileReader(conf_filename); // fReader = new FileReader(conf_filename);
buffReader = new BufferedReader(fReader); // buffReader = new BufferedReader(fReader);
this.paramTable = new Hashtable(); this.paramTable = new Hashtable();
try try
{ {
while ((line=buffReader.readLine()) != null) // while ((line=buffReader.readLine()) != null)
{ // {
line = line.trim(); // line = line.trim();
if (line.length() == 0 || line.charAt(0) == '#') // if (line.length() == 0 || line.charAt(0) == '#')
{ // {
continue; // continue;
} // }
//
parts = line.split("=", 2); // parts = line.split("=", 2);
if (parts.length != 2) // if (parts.length != 2)
{ // {
continue; // continue;
} // }
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(conf_filename);
name = parts[0].trim(); // System.out.println(conf_filename+"========================================");
value = parts[1].trim(); Properties props = new Properties();
props.load(is);
Iterator<Map.Entry<Object, Object>> it = props.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<Object, Object> entry = it.next();
name= entry.getKey().toString();
value = entry.getValue().toString();
// System.out.println(name+"======================================");
obj = this.paramTable.get(name); obj = this.paramTable.get(name);
if (obj == null) if (obj == null)
{ {
@ -178,10 +185,33 @@ public class IniFileReader
valueList.add(value); valueList.add(value);
} }
} }
// name = parts[0].trim();
// value = parts[1].trim();
// obj = this.paramTable.get(name);
// if (obj == null)
// {
// this.paramTable.put(name, value);
// }
// else if (obj instanceof String)
// {
// valueList = new ArrayList();
// valueList.add(obj);
// valueList.add(value);
// this.paramTable.put(name, valueList);
// }
// else
// {
// valueList = (ArrayList)obj;
// valueList.add(value);
// }
// }
} }
finally finally
{ {
fReader.close(); if (is!=null)
is.close();
// fReader.close();
} }
} }
} }