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/05 22:36:50 UTC
svn commit: r1240829 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: rmannibucau
Date: Sun Feb 5 21:36:49 2012
New Revision: 1240829
URL: http://svn.apache.org/viewvc?rev=1240829&view=rev
Log:
don't unpack warFile if it is a directory
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1240829&r1=1240828&r2=1240829&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sun Feb 5 21:36:49 2012
@@ -664,7 +664,9 @@ public class DeploymentLoader implements
public WebModule createWebModule(final String appId, final String warPath, final ClassLoader parentClassLoader, final String contextRoot, final String moduleName) throws OpenEJBException {
File warFile = new File(warPath);
- warFile = unpack(warFile);
+ if (!warFile.isDirectory()) {
+ warFile = unpack(warFile);
+ }
// read web.xml file
final Map<String, URL> descriptors;