Author: gadams
Date: Sun Jul 6 05:34:16 2014
New Revision: 1608162
URL: http://svn.apache.org/r1608162
Log:
Fix leaked resource warnings from Eclipse (Kepler).
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
Sun Jul 6 05:34:16 2014
@@ -63,6 +63,7 @@ public class FontPatternExtractor {
}
ByteArrayInputStream bin = new
ByteArrayInputStream(baout.toByteArray());
+ IOUtils.closeQuietly(baout);
DataInputStream din = new DataInputStream(bin);
long len = din.readInt() & 0xFFFFFFFFL;
println("Length: " + len);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
Sun Jul 6 05:34:16 2014
@@ -21,10 +21,11 @@ package org.apache.fop.afp.goca;
import java.awt.Color;
import java.awt.color.ColorSpace;
-import java.io.DataOutput;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.xmlgraphics.java2d.color.CIELabColorSpace;
@@ -105,6 +106,7 @@ public class GraphicsSetProcessColor ext
ColorSpace cs = color.getColorSpace();
int colSpaceType = cs.getType();
ByteArrayOutputStream baout = new ByteArrayOutputStream();
+ DataOutputStream dout = null;
byte[] colsizes;
if (colSpaceType == ColorSpace.TYPE_CMYK) {
colspace = CMYK;
@@ -121,7 +123,7 @@ public class GraphicsSetProcessColor ext
} else if (cs instanceof CIELabColorSpace) {
colspace = CIELAB;
colsizes = new byte[] {0x08, 0x08, 0x08, 0x00};
- DataOutput dout = new java.io.DataOutputStream(baout);
+ dout = new DataOutputStream(baout);
//According to GOCA, I'd expect the multiplicator below to be
255f, not 100f
//But only IBM AFP Workbench seems to support Lab colors and it
requires "c * 100f"
int l = Math.round(colorComponents[0] * 100f);
@@ -131,6 +133,8 @@ public class GraphicsSetProcessColor ext
dout.writeByte(a);
dout.writeByte(b);
} else {
+ IOUtils.closeQuietly(dout);
+ IOUtils.closeQuietly(baout);
throw new IllegalStateException();
}
@@ -151,6 +155,8 @@ public class GraphicsSetProcessColor ext
os.write(data);
baout.writeTo(os);
+ IOUtils.closeQuietly(dout);
+ IOUtils.closeQuietly(baout);
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java Sun
Jul 6 05:34:16 2014
@@ -85,6 +85,7 @@ public class PFMFile {
short sh2 = in.readByte();
if (sh1 == 128 && sh2 == 1) {
//Found the first section header of a PFB file!
+ IOUtils.closeQuietly(in);
throw new IOException("Cannot parse PFM file. You probably
specified the PFB file"
+ " of a Type 1 font as parameter instead of the PFM.");
}
@@ -93,6 +94,7 @@ public class PFMFile {
bufin.read(b);
if (new String(b, "US-ASCII").equalsIgnoreCase("StartFontMetrics")) {
//Found the header of a AFM file!
+ IOUtils.closeQuietly(in);
throw new IOException("Cannot parse PFM file. You probably
specified the AFM file"
+ " of a Type 1 font as parameter instead of the PFM.");
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
Sun Jul 6 05:34:16 2014
@@ -36,6 +36,8 @@ import java.util.List;
import org.xml.sax.InputSource;
+import org.apache.commons.io.IOUtils;
+
/**
* <p>This tree structure stores the hyphenation patterns in an efficient
* way for fast lookup. It provides the provides the method to
@@ -709,9 +711,9 @@ public class HyphenationTree extends Ter
token = in.readLine().trim();
long starttime = 0;
int counter = 0;
+ BufferedReader reader = null;
try {
- BufferedReader reader
- = new BufferedReader(new FileReader(token));
+ reader = new BufferedReader(new FileReader(token));
String line;
starttime = System.currentTimeMillis();
@@ -731,6 +733,8 @@ public class HyphenationTree extends Ter
} catch (Exception ioe) {
System.out.println("Exception " + ioe);
ioe.printStackTrace();
+ } finally {
+ IOUtils.closeQuietly(reader);
}
long endtime = System.currentTimeMillis();
long result = endtime - starttime;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
Sun Jul 6 05:34:16 2014
@@ -97,6 +97,7 @@ public class PreloaderWMF extends Abstra
int magic = EndianUtils.swapInteger(din.readInt());
din.reset();
if (magic != WMFConstants.META_ALDUS_APM) {
+ IOUtils.closeQuietly(din);
return null; //Not a WMF file
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Sun Jul
6 05:34:16 2014
@@ -1587,6 +1587,8 @@ public class PDFFactory {
log.error(
"Failed to write CIDSet [" + cidFont + "] "
+ cidFont.getEmbedFontName(), ioe);
+ } finally {
+ IOUtils.closeQuietly(baout);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java Sun
Jul 6 05:34:16 2014
@@ -21,6 +21,7 @@ package org.apache.fop.pdf;
import java.io.IOException;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
/**
@@ -167,7 +168,9 @@ public class PDFOutputIntent extends PDF
} catch (IOException ioe) {
log.error("Ignored I/O exception", ioe);
}
- return bout.toByteArray();
+ byte[] bytes = bout.toByteArray();
+ IOUtils.closeQuietly(bout);
+ return bytes;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
Sun Jul 6 05:34:16 2014
@@ -42,6 +42,7 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.xmlgraphics.image.GraphicsUtil;
@@ -447,6 +448,8 @@ public class PCLGenerator {
writeCommand("*c" + patternID + "G");
writeCommand("*c" + baout.size() + "W");
baout.writeTo(this.out);
+ IOUtils.closeQuietly(data);
+ IOUtils.closeQuietly(baout);
writeCommand("*c4Q"); //temporary pattern
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
Sun Jul 6 05:34:16 2014
@@ -26,6 +26,7 @@ import java.awt.image.Raster;
import java.io.IOException;
import java.util.Arrays;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -241,12 +242,12 @@ public abstract class AbstractImageAdapt
+ " The image may not be handled correctly." + " Base
color space: "
+ icm.getColorSpace() + " Image: " + image.getInfo());
}
- ByteArrayOutputStream baout = new ByteArrayOutputStream();
int c = icm.getMapSize();
int hival = c - 1;
if (hival > MAX_HIVAL) {
throw new UnsupportedOperationException("hival must not go beyond
" + MAX_HIVAL);
}
+ ByteArrayOutputStream baout = new ByteArrayOutputStream();
boolean isDeviceGray = false;
int[] palette = new int[c];
icm.getRGBs(palette);
@@ -276,6 +277,7 @@ public abstract class AbstractImageAdapt
indexed.add(hival);
indexed.add(baout.toByteArray());
+ IOUtils.closeQuietly(baout);
dict.put("ColorSpace", indexed);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=1608162&r1=1608161&r2=1608162&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
Sun Jul 6 05:34:16 2014
@@ -28,6 +28,7 @@ import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
+import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.BuildException;
/**
@@ -98,6 +99,7 @@ public class FileCompare {
* @return true if files are same byte-by-byte, false otherwise
*/
private static boolean compareBytes(File file1, File file2) throws
IOException {
+ boolean same = true;
BufferedInputStream file1Input
= new BufferedInputStream(new java.io.FileInputStream(file1));
BufferedInputStream file2Input
@@ -111,11 +113,15 @@ public class FileCompare {
charact1 = file1Input.read();
charact2 = file2Input.read();
} else {
- return false;
+ same = false;
+ break;
}
}
- return true;
+ IOUtils.closeQuietly(file1Input);
+ IOUtils.closeQuietly(file2Input);
+
+ return same;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
