You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/06/28 11:28:03 UTC
svn commit: r202147 -
/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
Author: deepal
Date: Tue Jun 28 02:28:01 2005
New Revision: 202147
URL: http://svn.apache.org/viewcvs?rev=202147&view=rev
Log:
throw an exeption if the server repository is null
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=202147&r1=202146&r2=202147&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Tue Jun 28 02:28:01 2005
@@ -122,6 +122,9 @@
}
public DeploymentEngine(String RepositaryName, String serverXMLFile) throws DeploymentException {
+ if(RepositaryName == null || RepositaryName.trim().equals("")){
+ throw new DeploymentException("Axis2 repositary can not be null");
+ }
this.folderName = RepositaryName;
axis2repository = RepositaryName;
File repository = new File(RepositaryName);
@@ -331,13 +334,13 @@
DeploymentData tempdata = DeploymentData.getInstance();
ArrayList inPhases = tempdata.getINPhases();
//TODO condition checking should be otherway since null value can occur
- if (!(((String) inPhases.get(0)).equals(PhaseMetadata.PHASE_TRANSPORTIN) &&
- ((String) inPhases.get(1)).equals(PhaseMetadata.PHASE_PRE_DISPATCH) &&
- ((String) inPhases.get(2)).equals(PhaseMetadata.PHASE_DISPATCH) &&
- ((String) inPhases.get(3)).equals(PhaseMetadata.PHASE_POST_DISPATCH))) {
- throw new DeploymentException("Invalid System predefined inphases , phase order dose not" +
- " support\n recheck axis2.xml");
- }
+ if (!(((String) inPhases.get(0)).equals(PhaseMetadata.PHASE_TRANSPORTIN) &&
+ ((String) inPhases.get(1)).equals(PhaseMetadata.PHASE_PRE_DISPATCH) &&
+ ((String) inPhases.get(2)).equals(PhaseMetadata.PHASE_DISPATCH) &&
+ ((String) inPhases.get(3)).equals(PhaseMetadata.PHASE_POST_DISPATCH))) {
+ throw new DeploymentException("Invalid System predefined inphases , phase order dose not" +
+ " support\n recheck axis2.xml");
+ }
// ArrayList outPhaes = tempdata.getOUTPhases();
//TODO do the validation code here
//ArrayList systemDefaultPhases =((AxisConfigurationImpl)axisConfig).getInPhasesUptoAndIncludingPostDispatch();
@@ -487,7 +490,7 @@
private void addNewModule(ModuleDescription moduelmetada) throws AxisFault {
- // currentArchiveFile.setClassLoader();
+ // currentArchiveFile.setClassLoader();
Flow inflow = moduelmetada.getInFlow();
if (inflow != null) {
addFlowHandlers(inflow);
@@ -583,7 +586,7 @@
log.info("AxisFault " + axisFault);
moduleStatus = "Error:\n" + axisFault.getMessage();
} finally {
- if (moduleStatus.startsWith("Error:")) {
+ if (moduleStatus.startsWith("Error:")) {
axisConfig.getFaulytModules().put(getAxisServiceName(currentArchiveFile.getName()), moduleStatus);
}
currentArchiveFile = null;