You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/02 17:10:50 UTC
svn commit: r1239693 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb:
assembler/ config/ config/sys/ core/ivm/naming/ core/webservices/ util/
Author: rmannibucau
Date: Thu Feb 2 16:10:49 2012
New Revision: 1239693
URL: http://svn.apache.org/viewvc?rev=1239693&view=rev
Log:
using IO.close in more sources
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarUtils.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Thu Feb 2 16:10:49 2012
@@ -29,6 +29,7 @@ import org.apache.openejb.config.Deploym
import org.apache.openejb.config.sys.AdditionalDeployments;
import org.apache.openejb.config.sys.Deployments;
import org.apache.openejb.config.sys.JaxbOpenejb;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -212,7 +213,12 @@ public class DeployerEjb implements Depl
try {
final AdditionalDeployments additionalDeployments;
if (config.exists()) {
- additionalDeployments = JaxbOpenejb.unmarshal(AdditionalDeployments.class, new FileInputStream(config));
+ final FileInputStream fis = new FileInputStream(config);
+ try {
+ additionalDeployments = JaxbOpenejb.unmarshal(AdditionalDeployments.class, fis);
+ } finally {
+ IO.close(fis);
+ }
} else {
additionalDeployments = new AdditionalDeployments();
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Feb 2 16:10:49 2012
@@ -66,6 +66,7 @@ import org.apache.openejb.jee.HandlerCha
import org.apache.openejb.jee.HandlerChains;
import org.apache.openejb.jee.ParamValue;
import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -451,11 +452,15 @@ public class ConfigurationFactory implem
additionalDeploymentFile = null;
}
if (additionalDeploymentFile.exists()) {
+ FileInputStream fis = null;
try {
- final AdditionalDeployments additionalDeployments = JaxbOpenejb.unmarshal(AdditionalDeployments.class, new FileInputStream(additionalDeploymentFile));
+ fis = new FileInputStream(additionalDeploymentFile);
+ final AdditionalDeployments additionalDeployments = JaxbOpenejb.unmarshal(AdditionalDeployments.class, fis);
deployments.addAll(additionalDeployments.getDeployments());
} catch (Exception e) {
logger.error("can't read " + ADDITIONAL_DEPLOYMENTS, e);
+ } finally {
+ IO.close(fis);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java Thu Feb 2 16:10:49 2012
@@ -16,21 +16,6 @@
*/
package org.apache.openejb.config;
-import static org.apache.openejb.util.JarExtractor.delete;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.jar.JarFile;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -39,9 +24,9 @@ import org.apache.commons.cli.OptionBuil
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.openejb.NoSuchApplicationException;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.UndeployException;
-import org.apache.openejb.NoSuchApplicationException;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.ClientInfo;
@@ -53,9 +38,24 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.cli.SystemExitException;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.JarExtractor;
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.OpenEjbVersion;
-import org.apache.openejb.util.JarExtractor;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Properties;
+import java.util.jar.JarFile;
+
+import static org.apache.openejb.loader.IO.close;
+import static org.apache.openejb.util.JarExtractor.delete;
/**
* Deploy EJB beans
@@ -379,16 +379,6 @@ public class Deploy {
return destinationDir;
}
-
- private static void close(Closeable in) {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- }
- }
- }
-
private static void help(Options options) {
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("deploy [options] <file> [<file>...]", "\n"+i18n("cmd.deploy.description"), options, "\n");
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java Thu Feb 2 16:10:49 2012
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.config.sys.ServiceProvider;
import org.apache.openejb.config.sys.ServicesJar;
@@ -255,9 +256,10 @@ public class ServiceUtils {
}
public static Properties loadProperties(String propertiesFile, Properties defaults) throws OpenEJBException {
+ InputStream in = null;
try {
File pfile = new File(propertiesFile);
- InputStream in = new FileInputStream(pfile);
+ in = new FileInputStream(pfile);
try {
/*
@@ -278,6 +280,8 @@ public class ServiceUtils {
throw new OpenEJBException(messages.format("conf.0007", propertiesFile, ex.getLocalizedMessage()), ex);
} catch (SecurityException ex) {
throw new OpenEJBException(messages.format("conf.0005", propertiesFile, ex.getLocalizedMessage()), ex);
+ } finally {
+ IO.close(in);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java Thu Feb 2 16:10:49 2012
@@ -16,28 +16,17 @@
*/
package org.apache.openejb.config;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Arrays;
+import org.apache.openejb.NoSuchApplicationException;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.UndeployException;
+import org.apache.openejb.assembler.Deployer;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.ConnectorInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.InfoObject;
+import org.apache.openejb.assembler.classic.WebAppInfo;
+
import javax.enterprise.deploy.model.DeployableObject;
import javax.enterprise.deploy.shared.ActionType;
import javax.enterprise.deploy.shared.CommandType;
@@ -58,17 +47,29 @@ import javax.enterprise.deploy.spi.statu
import javax.enterprise.deploy.spi.status.ProgressListener;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.naming.InitialContext;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
-import org.apache.openejb.NoSuchApplicationException;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.UndeployException;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.ClientInfo;
-import org.apache.openejb.assembler.classic.EjbJarInfo;
-import org.apache.openejb.assembler.classic.InfoObject;
-import org.apache.openejb.assembler.classic.ConnectorInfo;
-import org.apache.openejb.assembler.classic.WebAppInfo;
-import org.apache.openejb.assembler.Deployer;
+import static org.apache.openejb.loader.IO.close;
public class VmDeploymentManager implements DeploymentManager {
private static final Target DEFAULT_TARGET = new TargetImpl("DefaultTarget", "OpenEJB Default Target");
@@ -713,13 +714,4 @@ public class VmDeploymentManager impleme
return buf.toString();
}
}
-
- private static void close(Closeable thing) {
- if (thing != null) {
- try {
- thing.close();
- } catch (Exception ignored) {
- }
- }
- }
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Thu Feb 2 16:10:49 2012
@@ -17,16 +17,17 @@
package org.apache.openejb.config.sys;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.JAXBContextFactory;
import org.apache.openejb.config.ConfigUtils;
+import org.apache.openejb.jee.JAXBContextFactory;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.xbean.finder.ResourceFinder;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLFilterImpl;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -50,10 +51,10 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.List;
public abstract class JaxbOpenejb {
@SuppressWarnings({"unchecked"})
@@ -229,12 +230,7 @@ public abstract class JaxbOpenejb {
} catch (Exception e) {
throw new OpenEJBException("Unable to read OpenEJB configuration file at " + configFile, e);
} finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- }
- }
+ IO.close(in);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Thu Feb 2 16:10:49 2012
@@ -16,6 +16,26 @@
*/
package org.apache.openejb.core.ivm.naming;
+import org.apache.openejb.ClassLoaderUtil;
+import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
+import org.apache.openejb.core.ivm.IntraVmProxy;
+import org.apache.openejb.core.ivm.naming.java.javaURLContextFactory;
+import org.apache.openejb.core.ivm.naming.openejb.openejbURLContextFactory;
+import org.apache.openejb.loader.IO;
+import org.apache.xbean.naming.context.ContextUtil;
+
+import javax.naming.Binding;
+import javax.naming.CompositeName;
+import javax.naming.Context;
+import javax.naming.LinkRef;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
+import javax.naming.spi.ObjectFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -23,8 +43,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.NotSerializableException;
import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.io.PrintStream;
+import java.io.Serializable;
import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
@@ -35,29 +55,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
-import javax.naming.Binding;
-import javax.naming.CompositeName;
-import javax.naming.Context;
-import javax.naming.LinkRef;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.OperationNotSupportedException;
-import javax.naming.InitialContext;
-import javax.naming.spi.ObjectFactory;
-
-import org.apache.openejb.ClassLoaderUtil;
-import org.apache.openejb.assembler.classic.JndiBuilder;
-import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
-import org.apache.openejb.core.ivm.IntraVmProxy;
-import org.apache.openejb.core.ivm.naming.openejb.openejbURLContextFactory;
-import org.apache.openejb.core.ivm.naming.java.javaURLContextFactory;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
-import org.apache.xbean.naming.context.ContextUtil;
/*
* This class wrappers a specific NameNode which is the data model for the JNDI
@@ -256,11 +253,14 @@ public class IvmContext implements Conte
if (urlPackagePrefixes == null) {
String javahome = System.getProperty("java.home");
if (javahome != null) {
+ InputStream in = null;
try {
File propertiesFile = new File(new File(javahome, "lib"), "jndi.properties");
- InputStream in = new FileInputStream(propertiesFile);
+ in = new FileInputStream(propertiesFile);
urlPackagePrefixes = getUrlPackagePrefixes(in);
} catch (FileNotFoundException ignored) {
+ } finally {
+ IO.close(in);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java Thu Feb 2 16:10:49 2012
@@ -16,45 +16,46 @@
*/
package org.apache.openejb.core.webservices;
-import org.apache.openejb.util.Logger;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import org.w3c.dom.Element;
-import javax.xml.ws.spi.Provider;
-import javax.xml.ws.spi.ServiceDelegate;
-import javax.xml.ws.Endpoint;
+import javax.jws.WebService;
+import javax.xml.bind.JAXBContext;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.handler.HandlerResolver;
-import javax.xml.namespace.QName;
-import javax.xml.bind.JAXBContext;
-import javax.xml.transform.Source;
-import javax.jws.WebService;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.List;
-import java.util.Properties;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.ArrayList;
-import java.util.concurrent.Executor;
+import javax.xml.ws.soap.SOAPBinding;
+import javax.xml.ws.spi.Provider;
+import javax.xml.ws.spi.ServiceDelegate;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.OutputStream;
-import java.io.FileOutputStream;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
public class ProviderWrapper extends Provider {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, ProviderWrapper.class);
@@ -395,12 +396,7 @@ public class ProviderWrapper extends Pro
}
} catch(Exception ignored) {
} finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- }
- }
+ IO.close(in);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java Thu Feb 2 16:10:49 2012
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.loader.IO;
+
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -159,18 +161,8 @@ public class JarExtractor {
logger.error("Copy failed: src: " + fileSrc + ", dest: " + fileDest, e);
result = false;
} finally {
- if (ic != null) {
- try {
- ic.close();
- } catch (IOException e) {
- }
- }
- if (oc != null) {
- try {
- oc.close();
- } catch (IOException e) {
- }
- }
+ IO.close(ic);
+ IO.close(oc);
}
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarUtils.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarUtils.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarUtils.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarUtils.java Thu Feb 2 16:10:49 2012
@@ -16,6 +16,9 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.IO;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -26,8 +29,6 @@ import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
-import org.apache.openejb.OpenEJBException;
-
/**
* @version $Rev$ $Date$
*/
@@ -36,22 +37,22 @@ public class JarUtils {
private static Messages messages = new Messages("org.apache.openejb.util.resources");
public static void addFileToJar(String jarFile, String file) throws OpenEJBException {
+ JarInputStream jis = null;
+ JarOutputStream jos = null;
+ FileInputStream fis = null;
try {
- JarInputStream jis = new JarInputStream(new FileInputStream(jarFile));
+ jis = new JarInputStream(new FileInputStream(jarFile));
File tempJar = File.createTempFile("temp", "jar");
- JarOutputStream jos = new JarOutputStream(new FileOutputStream(tempJar));
- JarEntry nextJarEntry = null;
+ jos = new JarOutputStream(new FileOutputStream(tempJar));
+ JarEntry nextJarEntry;
while ((nextJarEntry = jis.getNextJarEntry()) != null) {
jos.putNextEntry(nextJarEntry);
}
- jis.close();
jos.putNextEntry(new JarEntry(file));
- FileInputStream fis = new FileInputStream(file);
+ fis = new FileInputStream(file);
for (int c = fis.read(); c != -1; c = fis.read()) {
jos.write(c);
}
- fis.close();
- jos.close();
File oldJar = new File(jarFile);
oldJar.delete();
@@ -60,6 +61,10 @@ public class JarUtils {
throw new OpenEJBException(messages.format("file.0003", file, jarFile, e.getMessage()), e);
} catch (IOException e) {
throw new OpenEJBException(messages.format("file.0003", file, jarFile, e.getMessage()), e);
+ } finally {
+ IO.close(fis);
+ IO.close(jis);
+ IO.close(jos);
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1239693&r1=1239692&r2=1239693&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Thu Feb 2 16:10:49 2012
@@ -20,6 +20,7 @@ import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.SimpleLayout;
import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import java.io.BufferedInputStream;
@@ -85,11 +86,7 @@ public class Log4jLogStreamFactory imple
applyOverrides(props);
preprocessProperties(props);
PropertyConfigurator.configure(props);
- try {
- bis.close();
- } catch (Throwable e) {
- //Ignore
- }
+ IO.close(bis);
} else {
// install our logging.properties file into the conf dir
installLoggingPropertiesFile(loggingPropertiesFile);