You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/18 10:48:58 UTC
svn commit: r1094360 -
/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Author: xuhaihong
Date: Mon Apr 18 08:48:58 2011
New Revision: 1094360
URL: http://svn.apache.org/viewvc?rev=1094360&view=rev
Log:
Remove unnecessary try-catch block
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1094360&r1=1094359&r2=1094360&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Apr 18 08:48:58 2011
@@ -314,19 +314,16 @@ public class EjbModuleBuilder implements
URL baseUrl = null;
Map<String, URL> descriptors = null;
- try {
- File jarFile = new File(moduleFile.getName());
- baseUrl = jarFile.toURI().toURL();
+ File jarFile = new File(moduleFile.getName());
- classLoader = ClassLoaderUtil.createTempClassLoader(ClassLoaderUtil.createClassLoader(jarPath, new URL[] { baseUrl }, OpenEJB.class.getClassLoader()));
+ baseUrl = jarFile.toURI().toURL();
- ResourceFinder finder = new ResourceFinder("", classLoader, baseUrl);
+ classLoader = ClassLoaderUtil.createTempClassLoader(ClassLoaderUtil.createClassLoader(jarPath, new URL[] { baseUrl }, OpenEJB.class.getClassLoader()));
- descriptors = finder.getResourcesMap(ddDir);
- } catch (IOException e) {
- throw new DeploymentException(e);
- }
+ ResourceFinder finder = new ResourceFinder("", classLoader, baseUrl);
+
+ descriptors = finder.getResourcesMap(ddDir);
if (!isEjbModule(baseUrl, classLoader, descriptors)) {
releaseTempClassLoader(classLoader);