[Red5commits] [661] lhubbard

[luke@codegent.com]

Added check to see if webapp has red5 context to remoting servlet
Changed standalone to init red5.net first.


Timestamp: 04/09/06 07:44:38 (2 hours ago) 
Change: 661 
Author: lhubbard

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/Standalone.java
java/server/trunk/src/org/red5/server/net/servlet/AMFGatewayServlet.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/661

Index: /java/server/trunk/src/org/red5/server/net/servlet/AMFGatewayServlet.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/servlet/AMFGatewayServlet.java (revision 651)
+++ /java/server/trunk/src/org/red5/server/net/servlet/AMFGatewayServlet.java (revision 661)
@@ -37,6 +37,10 @@
 	public void init() throws ServletException {
 		webAppCtx = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
-		webContext  = (IContext) webAppCtx.getBean("web.context");
-		codecFactory = (RemotingCodecFactory) webAppCtx.getBean("remotingCodecFactory");
+		if(webAppCtx != null){
+			webContext  = (IContext) webAppCtx.getBean("web.context");
+			codecFactory = (RemotingCodecFactory) webAppCtx.getBean("remotingCodecFactory");
+		} else {
+			log.debug("No web context");
+		}
 	}
 
Index: /java/server/trunk/src/org/red5/server/Standalone.java
===================================================================
--- /java/server/trunk/src/org/red5/server/Standalone.java (revision 651)
+++ /java/server/trunk/src/org/red5/server/Standalone.java (revision 661)
@@ -66,5 +66,5 @@
 		log.info("Loading red5 global context from: "+red5Config);
 		
-		ContextSingletonBeanFactoryLocator.getInstance(red5Config).useBeanFactory("red5.global");
+		ContextSingletonBeanFactoryLocator.getInstance(red5Config).useBeanFactory("red5.net");
 
 		long startupIn = System.currentTimeMillis() - time;