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 na...@apache.org on 2008/04/18 02:07:36 UTC
svn commit: r649334 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Author: nadiramra
Date: Thu Apr 17 17:07:33 2008
New Revision: 649334
URL: http://svn.apache.org/viewvc?rev=649334&view=rev
Log:
AXIS2-3746 - should not be modifying files as part of deployment process.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=649334&r1=649333&r2=649334&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Thu Apr 17 17:07:33 2008
@@ -71,7 +71,6 @@
WSInfo info = (WSInfo) currentJars.get(file.getAbsolutePath());
if (info != null) {
if (deploymentEngine.isHotUpdate() && isModified(file, info)) {
-// info.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(info.getFileName(), info.getLastModifiedDate(), deployer,type);
deploymentEngine.addWSToUndeploy(wsInfo); // add entry to undeploy list
DeploymentFileData deploymentFileData = new DeploymentFileData(file, deployer);
@@ -171,23 +170,17 @@
* @param wsInfo
*/
private boolean isModified(File file, WSInfo wsInfo) {
- if (file.isDirectory()) {
- if (isChanged(file, wsInfo.getLastModifiedDate(), wsInfo)) {
- setLastModifiedDate(file, wsInfo);
- return true;
- } else {
- return false;
- }
- } else {
- if(wsInfo.getLastModifiedDate() != file.lastModified()) {
- wsInfo.setLastModifiedDate(file.lastModified());
- return true;
- } else {
- return false;
- }
- }
+ long currentTimeStamp = wsInfo.getLastModifiedDate();
+
+ setLastModifiedDate(file, wsInfo);
+
+ return (currentTimeStamp != wsInfo.getLastModifiedDate());
}
+ /**
+ * Obtains the newest (as compared with timestamp stored in wsInfo)
+ * timestamp and stores it in WSInfo.
+ */
private void setLastModifiedDate(File file, WSInfo wsInfo) {
if (file.isDirectory()) {
File files [] = file.listFiles();
@@ -195,33 +188,14 @@
File fileItem = files[i];
if (fileItem.isDirectory()) {
setLastModifiedDate(fileItem, wsInfo);
- } else {
- fileItem.setLastModified(wsInfo.getLastModifiedDate());
}
- }
- } else {
- file.setLastModified(wsInfo.getLastModifiedDate());
- }
- }
-
- private boolean isChanged(File file, long lastModifedData, WSInfo wsInfo) {
- File files [] = file.listFiles();
- for (int i = 0; i < files.length; i++) {
- File fileItem = files[i];
- if (fileItem.isDirectory()) {
- if (isChanged(fileItem, lastModifedData, wsInfo)) {
- wsInfo.setLastModifiedDate(fileItem.lastModified());
- return true;
- }
- } else {
- if (lastModifedData != fileItem.lastModified()) {
+ else if(wsInfo.getLastModifiedDate() < fileItem.lastModified()) {
wsInfo.setLastModifiedDate(fileItem.lastModified());
- return true;
}
}
}
- return false;
+ else if(wsInfo.getLastModifiedDate() < file.lastModified()) {
+ wsInfo.setLastModifiedDate(file.lastModified());
+ }
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org