[wsas-java-dev] svn commit r10804 - trunk/wsas/java/modules/core/src/org/wso2/wsas/transport

[svn]

Author: saminda
Date: Mon Dec 10 01:38:24 2007
New Revision: 10804

Log:

Preventing a possible NULL pointer and fall back to ServerManager to get the 
configuration context 


Modified:
   
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
   
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java

Modified: 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
==============================================================================
--- 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
   (original)
+++ 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
   Mon Dec 10 01:38:24 2007
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.utils.ServerException;
 import org.wso2.wsas.util.FileDownloadUtil;
+import org.wso2.wsas.ServerManager;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -66,6 +67,9 @@
         ServletContext servletContext = servletConfig.getServletContext();
         this.configContext =
                 (ConfigurationContext) 
servletContext.getAttribute(CONFIGURATION_CONTEXT);
+        if (this.configContext == null) {
+            this.configContext = ServerManager.getInstance().configContext;
+        }
         this.axisConfiguration = this.configContext.getAxisConfiguration();
         fileDownloadUtil = new FileDownloadUtil();
         servletContext.setAttribute(this.getClass().getName(), this);

Modified: 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java
==============================================================================
--- 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java 
    (original)
+++ 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java 
    Mon Dec 10 01:38:24 2007
@@ -22,6 +22,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.utils.ServerException;
 import org.wso2.wsas.transport.fileupload.FileUploadExecutorManager;
+import org.wso2.wsas.ServerManager;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -59,6 +60,9 @@
         ServletContext servletContext = servletConfig.getServletContext();
         configContext =
                 (ConfigurationContext) 
servletContext.getAttribute(CONFIGURATION_CONTEXT);
+        if (configContext == null) {
+            configContext = ServerManager.getInstance().configContext;
+        }
         axisConfiguration = configContext.getAxisConfiguration();
         try {
             fileUploadExecutorManager = new 
FileUploadExecutorManager(configContext);

_______________________________________________
Wsas-java-dev mailing list
Wsas-java-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev