You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2008/12/03 00:22:07 UTC
svn commit: r722665 -
/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Author: midon
Date: Tue Dec 2 15:22:05 2008
New Revision: 722665
URL: http://svn.apache.org/viewvc?rev=722665&view=rev
Log:
ODE-445: make it null proof
Modified:
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=722665&r1=722664&r2=722665&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Tue Dec 2 15:22:05 2008
@@ -102,7 +102,7 @@
private EndpointReferenceContext eprContext;
private final ProcessCleanupConfImpl processCleanupConfImpl;
-
+
ProcessConfImpl(QName pid, QName type, long version, DeploymentUnitDir du, TDeployment.Process pinfo, Date deployDate,
Map<QName, Node> props, ProcessState pstate, EndpointReferenceContext eprContext, File configDir) {
_pid = pid;
@@ -122,7 +122,7 @@
initLinks();
initMexInterceptors();
initEventList();
-
+
processCleanupConfImpl = new ProcessCleanupConfImpl(pinfo);
}
@@ -131,18 +131,23 @@
List<File> propFiles = new ArrayList<File>();
propFiles.addAll(_du.getEndpointConfigFiles());
- if (_configDir != null && _configDir.isDirectory()) {
+ if (_configDir == null) {
+ if (__log.isDebugEnabled()) __log.debug("No config directory set up.");
+ } else if (_configDir.isDirectory()) {
// list and sort endpoint config files
File[] files = _configDir.listFiles(new FileFilter() {
public boolean accept(File path) {
return path.getName().endsWith(".endpoint") && path.isFile();
}
});
- Arrays.sort(files);
- propFiles.addAll(Arrays.asList(files));
- }else{
- // this case should not happen since the dir exsistence is tested in ODEServer
- if(__log.isWarnEnabled()) __log.warn(_configDir+" does not exist or is not a directory");
+ if (files != null) {
+ Arrays.sort(files);
+ propFiles.addAll(Arrays.asList(files));
+ } else {
+ if (__log.isErrorEnabled()) __log.error(_configDir + " does not exist or is not a directory");
+ }
+ } else {
+ if (__log.isErrorEnabled()) __log.error(_configDir + " does not exist or is not a directory");
}
return propFiles;
}
@@ -492,10 +497,10 @@
}
public boolean isCleanupCategoryEnabled(boolean instanceSucceeded, CLEANUP_CATEGORY category) {
- return processCleanupConfImpl.isCleanupCategoryEnabled(instanceSucceeded, category);
+ return processCleanupConfImpl.isCleanupCategoryEnabled(instanceSucceeded, category);
}
-
+
public Set<CLEANUP_CATEGORY> getCleanupCategories(boolean instanceSucceeded) {
- return processCleanupConfImpl.getCleanupCategories(instanceSucceeded);
+ return processCleanupConfImpl.getCleanupCategories(instanceSucceeded);
}
}