Merge origin/master

This commit is contained in:
Henry Varona 2016-11-29 14:35:28 -04:30
commit a505e29cea

View file

@ -57,12 +57,12 @@ public class Util {
out.finish(); out.finish();
return output.toByteArray(); return output.toByteArray();
} catch (IOException ex) { } catch (IOException ex) {
Logger.getLogger(FileBin.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex);
} finally { } finally {
try { try {
out.close(); out.close();
} catch (IOException ex) { } catch (IOException ex) {
Logger.getLogger(FileBin.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
return null; return null;
@ -88,12 +88,12 @@ public class Util {
in.close(); in.close();
return output.toByteArray(); return output.toByteArray();
} catch (IOException ex) { } catch (IOException ex) {
Logger.getLogger(FileBin.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex);
} finally { } finally {
try { try {
in.close(); in.close();
} catch (IOException ex) { } catch (IOException ex) {
Logger.getLogger(FileBin.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
return null; return null;