Author: rr
Date: Sat Jul 10 12:09:21 2010
New Revision: 962826
URL: http://svn.apache.org/viewvc?rev=962826&view=rev
Log:
ODE-870: Deployment Poller doesnot throw error if .depolyed file has errors
(fix thanks to Veresh Jain)
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java?rev=962826&r1=962825&r2=962826&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
Sat Jul 10 12:09:21 2010
@@ -96,8 +96,13 @@ public class DeploymentPoller {
public DeploymentPoller(File deployDir, final ODEServer odeServer) {
_odeServer = odeServer;
_deployDir = deployDir;
- if (!_deployDir.exists())
- _deployDir.mkdir();
+ if (!_deployDir.exists()) {
+ boolean isDeployDirCreated = _deployDir.mkdir();
+ if (!isDeployDirCreated) {
+ __log.error("Error while creating deploy directory "
+ + deployDir.getName());
+ }
+ }
_systemSchedulesConf =
createSystemSchedulesConfig(odeServer.getConfigRoot());
_systemCronConfigWatchDog =
createSystemCronConfigWatchDog(odeServer.getBpelServer().getContexts().cronScheduler);
}
@@ -145,7 +150,13 @@ public class DeploymentPoller {
}
try {
- deployedMarker.createNewFile();
+ boolean isCreated = deployedMarker.createNewFile();
+ if (!isCreated) {
+ __log
+ .error("Error while creating file "
+ + file.getName()
+ + ".deployed ,deployment could be
inconsistent");
+ }
} catch (IOException e1) {
__log.error("Error creating deployed marker file, " + file
+ " will not be deployed");
continue;
@@ -173,7 +184,13 @@ public class DeploymentPoller {
File deployDir = new File(_deployDir, pkg);
if (!deployDir.exists()) {
Collection<QName> undeployed =
_odeServer.getProcessStore().undeploy(deployDir);
- file.delete();
+ boolean isDeleted = file.delete();
+ if (!isDeleted) {
+ __log
+ .error("Error while deleting file "
+ + file.getName()
+ + ".deployed , please check if file is
locked or if it really exist");
+ }
disposeDeployXmlWatchDog(deployDir);
if (undeployed.size() > 0)
__log.info("Successfully undeployed " + pkg);
@@ -274,7 +291,11 @@ public class DeploymentPoller {
public void markAsDeployed(File file) {
File deployedMarker = new File(_deployDir, file.getName() +
".deployed");
try {
- deployedMarker.createNewFile();
+ boolean isCreated = deployedMarker.createNewFile();
+ if (!isCreated) {
+ __log.error("Error while creating file " + file.getName()
+ + ".deployed ,deployment could be inconsistent");
+ }
} catch (IOException e) {
__log.error("Couldn't create marker file for " + file.getName());
}
@@ -282,7 +303,13 @@ public class DeploymentPoller {
public void markAsUndeployed(File file) {
File deployedMarker = new File(_deployDir, file.getName() +
".deployed");
- deployedMarker.delete();
+ boolean isDeleted = deployedMarker.delete();
+ if (!isDeleted) {
+ __log
+ .error("Error while deleting file "
+ + file.getName()
+ + ".deployed , please check if file is locked or
if it really exist");
+ }
}
@SuppressWarnings("unchecked")
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?rev=962826&r1=962825&r2=962826&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
Sat Jul 10 12:09:21 2010
@@ -166,7 +166,10 @@ public class DeploymentWebService {
_poller.hold();
File dest = new File(_deployPath, bundleName + "-" +
_store.getCurrentVersion());
- dest.mkdir();
+ boolean createDir = dest.mkdir();
+ if(!createDir){
+ throw new OdeFault("Error while creating file "
+ dest.getName());
+ }
unzip(dest, (DataHandler) binaryNode.getDataHandler());
// Check that we have a deploy.xml
@@ -178,7 +181,9 @@ public class DeploymentWebService {
Collection<QName> deployed = _store.deploy(dest);
File deployedMarker = new File(_deployPath,
dest.getName() + ".deployed");
- deployedMarker.createNewFile();
+ if(!deployedMarker.createNewFile()) {
+ throw new OdeFault("Error while creating file "
+ deployedMarker.getName() + "deployment failed");
+ }
// Telling the poller what we deployed so that it
doesn't try to deploy it again
_poller.markAsDeployed(dest);
@@ -222,7 +227,11 @@ public class DeploymentWebService {
Collection<QName> undeployed =
_store.undeploy(deploymentDir);
File deployedMarker = new File(deploymentDir +
".deployed");
- deployedMarker.delete();
+ boolean isDeleted = deployedMarker.delete();
+
+ if (!isDeleted)
+ __log.error("Error while deleting file " +
deployedMarker.getName());
+
FileUtils.deepDelete(deploymentDir);
OMElement response =
factory.createOMElement("response", null);
