Author: dims
Date: Mon Mar 3 07:26:40 2008
New Revision: 633127
URL: http://svn.apache.org/viewvc?rev=633127&view=rev
Log:
Fix for AXIS2-3539 - Redundant checks into WarBasedAxisConfigurator
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=633127&r1=633126&r2=633127&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Mon Mar 3 07:26:40 2008
@@ -106,13 +106,11 @@
setWebLocationString(weblocation.getAbsolutePath());
} // if webpath not null
- if (axis2Stream == null) {
- String axis2xmlpath =
config.getInitParameter(PARAM_AXIS2_XML_PATH);
- if (axis2xmlpath != null) {
- // when init parameter was present.
- axis2Stream = new FileInputStream(axis2xmlpath);
- log.debug("using axis2.xml from path: " +
axis2xmlpath);
- }
+ String axis2xmlpath =
config.getInitParameter(PARAM_AXIS2_XML_PATH);
+ if (axis2xmlpath != null) {
+ // when init parameter was present.
+ axis2Stream = new FileInputStream(axis2xmlpath);
+ log.debug("using axis2.xml from path: " + axis2xmlpath);
}
if (axis2Stream == null) {
@@ -188,14 +186,10 @@
*/
public AxisConfiguration getAxisConfiguration() throws AxisFault {
try {
- String repository = null;
-
- if (repository == null) {
- repository =
config.getInitParameter(PARAM_AXIS2_REPOSITORY_PATH);
- if (repository != null) {
- loadRepository(repository);
- log.debug("loaded repository from path: " + repository);
- }
+ String repository =
config.getInitParameter(PARAM_AXIS2_REPOSITORY_PATH);
+ if (repository != null) {
+ loadRepository(repository);
+ log.debug("loaded repository from path: " + repository);
}
if (repository == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
