inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

Browse Source 
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-24 18:27:41 +00:00
parent 3fa09a0401
commit 59f33f811b
2 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/webservice/axis/SpringBeanRPCProvider.java
View File

@@ -32,7 +32,7 @@ public class SpringBeanRPCProvider extends RPCProvider
{
private static final long serialVersionUID = 2173234269124176995L;
private static final String OPTION_NAME = "springBean";
private WebApplicationContext webAppCtx;
private static WebApplicationContext webAppCtx;
/**
* Retrieves the class of the bean represented by the given name
@@ -93,16 +93,26 @@ public class SpringBeanRPCProvider extends RPCProvider
*/
private WebApplicationContext getWebAppContext(MessageContext msgCtx) throws AxisFault
{
if (this.webAppCtx == null && msgCtx != null)
if (webAppCtx == null && msgCtx != null)
{
this.webAppCtx = Utils.getSpringContext(msgCtx);
webAppCtx = Utils.getSpringContext(msgCtx);
}
if (this.webAppCtx == null)
if (webAppCtx == null)
{
throw new AxisFault("Failed to retrieve the Spring web application context");
}
return this.webAppCtx;
return webAppCtx;
}
@Override
public void initServiceDesc(SOAPService service, MessageContext msgContext) throws AxisFault
{
if( msgContext != null )
{
getWebAppContext(msgContext);
}
super.initServiceDesc(service, msgContext);
}
}