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 2006/05/04 12:48:21 UTC
svn commit: r399655 -
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
Author: deepal
Date: Thu May 4 03:48:20 2006
New Revision: 399655
URL: http://svn.apache.org/viewcvs?rev=399655&view=rev
Log:
- checking whether null or not
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java?rev=399655&r1=399654&r2=399655&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java Thu May 4 03:48:20 2006
@@ -57,13 +57,13 @@
// OK, we've got a repository location in mind. Let's make
// sure it exists.
try {
- if(repoLocation != null) {
- File repo = new File(repoLocation);
- if (repo.exists()) {
- // ok, save it if so
- this.repoLocation = repo.getAbsolutePath();
- }
- }
+ if (repoLocation != null) {
+ File repo = new File(repoLocation);
+ if (repo.exists()) {
+ // ok, save it if so
+ this.repoLocation = repo.getAbsolutePath();
+ }
+ }
} catch (Exception e) {
log.info("Couldn't find repository location '" +
repoLocation + "'");
@@ -77,14 +77,16 @@
axis2xml = System.getProperty(Constants.AXIS2_CONF);
// In either case, check that the file exists... if not
// we'll use the default axis2.xml on the classpath.
- try {
- File configFile = new File(axis2xml);
- if (!configFile.exists()) {
+ if (axis2xml != null) {
+ try {
+ File configFile = new File(axis2xml);
+ if (!configFile.exists()) {
+ axis2xml = null;
+ }
+ } catch (Exception e) {
axis2xml = null;
- }
- } catch (Exception e) {
- axis2xml = null;
- log.info("Error in file (axis2.xml) creation inside FileSystemConfigurator");
+ log.info("Error in file (axis2.xml) creation inside FileSystemConfigurator");
+ }
}
}