You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2007/07/10 13:12:59 UTC
svn commit: r554905 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
DeploymentEngine.java URLBasedAxisConfigurator.java
Author: azeez
Date: Tue Jul 10 04:12:58 2007
New Revision: 554905
URL: http://svn.apache.org/viewvc?view=rev&rev=554905
Log:
1. Set the file - Otherwise it will cause an NPE
2. URL check for file should be file:/
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=554905&r1=554904&r2=554905
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Jul 10 04:12:58 2007
@@ -1014,7 +1014,7 @@
ConfigurationContext configCtx)
throws AxisFault {
try {
- DeploymentFileData currentDeploymentFile = new DeploymentFileData(null, null);
+ DeploymentFileData currentDeploymentFile = new DeploymentFileData(serviceFile, null);
DeploymentClassLoader classLoader = new DeploymentClassLoader(new URL[]{serviceFile.toURL()},
new ArrayList(),
Thread.currentThread().getContextClassLoader());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java?view=diff&rev=554905&r1=554904&r2=554905
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java Tue Jul 10 04:12:58 2007
@@ -57,9 +57,9 @@
if (axis2repoPara != null) {
String repoValue = (String) axis2repoPara.getValue();
if (repoValue != null && !"".equals(repoValue.trim())) {
- if (repoValue.startsWith("file://")) {
+ if (repoValue.startsWith("file:/")) {
// we treat this case specially , by assuming file is
- // locate in the local machine
+ // located in the local machine
loadRepository(repoValue);
} else {
loadRepositoryFromURL(new URL(repoValue));
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org