Merge branch 'master' of github.com:sleuthkit/autopsy

This commit is contained in:
Dick Fickling 2012-03-26 14:09:41 -04:00
commit 94a63be9ca

View File

@ -195,7 +195,11 @@ public void getregistryfiles(List<String> image, IngestImageWorkerController con
try { try {
File regfile = new File(regRecord); File regfile = new File(regRecord);
BufferedReader input = new BufferedReader(new InputStreamReader(new FileInputStream(regfile))); FileInputStream fstream = new FileInputStream(regfile);
InputStreamReader fstreamReader = new InputStreamReader(fstream, "UTF-8");
BufferedReader input = new BufferedReader(fstreamReader);
//logger.log(Level.INFO, "using encoding " + fstreamReader.getEncoding());
String regString = new Scanner(input).useDelimiter("\\Z").next(); String regString = new Scanner(input).useDelimiter("\\Z").next();
String startdoc = "<document>"; String startdoc = "<document>";
String result = regString.replaceAll("----------------------------------------",""); String result = regString.replaceAll("----------------------------------------","");