From: Tim P <ti...@us...> - 2008-03-25 22:54:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/src/org/webmacro/resource Modified Files: URLTemplateProvider.java Log Message: Eclipse: variable cannot be null Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** URLTemplateProvider.java 20 Mar 2008 11:14:07 -0000 1.20 --- URLTemplateProvider.java 25 Mar 2008 22:54:09 -0000 1.21 *************** *** 386,397 **** { String p = buildPath(pre, mid, post); ! if (path != null) ! { ! return (Template) _broker.get(_TYPE, p); ! } ! else ! { ! return (Template) _broker.get(_TYPE, p); ! } } catch (Exception ex) --- 386,390 ---- { String p = buildPath(pre, mid, post); ! return (Template) _broker.get(_TYPE, p); } catch (Exception ex) |