[WebMacro-cvs] webmacro/src/org/webmacro/adapter/spring WebMacroViewResolver.java, 1.7, 1.8

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13142/src/org/webmacro/adapter/spring

Modified Files:
	WebMacroViewResolver.java 
Log Message:
Checkstyle: avoid inner assignments

Index: WebMacroViewResolver.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroViewResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WebMacroViewResolver.java	20 Mar 2008 20:38:40 -0000	1.7
--- WebMacroViewResolver.java	20 Mar 2008 22:35:27 -0000	1.8
***************
*** 96,102 ****
              try
              {
!                 return webMacro == null
!                     ? webMacro = new WM(servletcontext,classLoader, null)
!                     : webMacro; // Can we find the servlet here using a bean context?
              }
              catch (InitException initEx)
--- 96,102 ----
              try
              {
!                 if (webMacro == null) // Can we find the servlet here using a bean context?
!                     webMacro = new WM(servletcontext,classLoader, null);
!                 return webMacro; 
              }
              catch (InitException initEx)