midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bf [2992291] MAttachment.addEntry not closing streams if an error occur 

https://sourceforge.net/tracker/?func=detail&aid=2992291&group_id=176962&atid=879332
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2992291
This commit is contained in:
freepath 2010-04-26 12:11:10 +00:00
parent e357babf9d
commit aaa75baf0b
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
base/src/org/compiere/model/MAttachment.java
View File

@ -59,6 +59,11 @@ import org.xml.sax.SAXException;
* One Attachment can have multiple entries * One Attachment can have multiple entries
* *
* @author Jorg Janke * @author Jorg Janke
*
* @author Silvano Trinchero
* <li>BF [ 2992291] MAttachment.addEntry not closing streams if an exception occur
* http://sourceforge.net/tracker/?func=detail&aid=2992291&group_id=176962&atid=879332
*
* @version $Id: MAttachment.java,v 1.4 2006/07/30 00:58:37 jjanke Exp $ * @version $Id: MAttachment.java,v 1.4 2006/07/30 00:58:37 jjanke Exp $
*/ */
public class MAttachment extends X_AD_Attachment public class MAttachment extends X_AD_Attachment
@ -254,22 +259,40 @@ public class MAttachment extends X_AD_Attachment
// //
String name = file.getName(); String name = file.getName();
byte[] data = null; byte[] data = null;
// F3P: BF [2992291] modified to be able to close streams in "finally" block
FileInputStream fis = null;
ByteArrayOutputStream os = null;
try try
{ {
FileInputStream fis = new FileInputStream (file); fis = new FileInputStream (file);
ByteArrayOutputStream os = new ByteArrayOutputStream(); os = new ByteArrayOutputStream();
byte[] buffer = new byte[1024*8]; // 8kB byte[] buffer = new byte[1024*8]; // 8kB
int length = -1; int length = -1;
while ((length = fis.read(buffer)) != -1) while ((length = fis.read(buffer)) != -1)
os.write(buffer, 0, length); os.write(buffer, 0, length);
fis.close();
data = os.toByteArray(); data = os.toByteArray();
os.close();
} }
catch (IOException ioe) catch (IOException ioe)
{ {
log.log(Level.SEVERE, "(file)", ioe); log.log(Level.SEVERE, "(file)", ioe);
} }
finally
{
if(fis != null)
{
try { fis.close(); } catch (IOException ex) { log.log(Level.SEVERE, "(file)", ex); };
}
if(os != null)
{
try { os.close(); } catch (IOException ex) { log.log(Level.SEVERE, "(file)", ex); };
}
}
return addEntry (name, data); return addEntry (name, data);
} // addEntry } // addEntry