AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be smarter about extracting the servlet context from the application

Browse Source 
context reference.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@461 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2001-11-20 21:32:34 +00:00
parent c54b4cfb08
commit 104c944c92
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/src/java/com/samskivert/velocity/ServletContextLogger.java
+9 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: ServletContextLogger.java,v 1.2 2001/11/20 21:13:47 mdb Exp $ // $Id: ServletContextLogger.java,v 1.3 2001/11/20 21:32:34 mdb Exp $
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2001 Michael Bayne // Copyright (C) 2001 Michael Bayne
@@ -54,7 +54,14 @@ public class ServletContextLogger implements LogSystem
// if we weren't constructed with a servlet context, try to obtain // if we weren't constructed with a servlet context, try to obtain
// one via the application context // one via the application context
if (_sctx == null) { if (_sctx == null) {
_sctx = (ServletContext)rsvc.getApplicationContext(); Object context = rsvc.getApplicationContext();
if (context != null) {
if (context instanceof Application) {
_sctx = ((Application)context).getServletContext();
} else if (context instanceof ServletContext) {
_sctx = (ServletContext)context;
}
}
} }
// if we still don't have one, complain // if we still don't have one, complain