svn commit: r1747601 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java

[veithen]

Author: veithen
Date: Thu Jun  9 22:17:36 2016
New Revision: 1747601

URL: http://svn.apache.org/viewvc?rev=1747601&view=rev
Log:
AXIS2-5778: Use the DeploymentFileData.getName() method to compute the archive 
name in ModuleDeployer.

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1747601&r1=1747600&r2=1747601&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
 Thu Jun  9 22:17:36 2016
@@ -204,14 +204,7 @@ public class ModuleDeployer extends Abst
             AxisModule module = new AxisModule();
             module.setModuleClassLoader(deploymentClassLoader);
             module.setParent(axisConfig);
-            int index = fileUrl.getPath().lastIndexOf(File.separator);
-            String moduleFile;
-            if(index > 0){
-                moduleFile = fileUrl.getPath().substring(index);               
 
-            } else {
-                moduleFile = fileUrl.getPath();                
-            }            
-            module.setArchiveName(moduleFile);
+            module.setArchiveName(deploymentFileData.getName());
             populateModule(module, fileUrl);
             module.setFileName(fileUrl);
             DeploymentEngine.addNewModule(module, axisConfig);