[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet ImageRenderingServlet.java, 1.4, 1.5

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2872/web/WEB-INF/classes/src/org/oscarehr/ui/servlet

Modified Files:
	ImageRenderingServlet.java 
Log Message:
better error handling

Index: ImageRenderingServlet.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet/ImageRenderingServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ImageRenderingServlet.java	24 Dec 2008 21:07:54 -0000	1.4
--- ImageRenderingServlet.java	26 Dec 2008 21:42:34 -0000	1.5
***************
*** 3,6 ****
--- 3,7 ----
  import java.io.BufferedOutputStream;
  import java.io.IOException;
+ import java.net.SocketException;
  
  import javax.servlet.http.HttpServlet;
***************
*** 48,53 ****
  			}
  		} catch (Exception e) {
! 			logger.error("ImageRenderingServlet generated unexpected error. qs=" + request.getQueryString(), e);
! 			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
  		}
  	}
--- 49,61 ----
  			}
  		} catch (Exception e) {
! 			if (e.getCause() instanceof SocketException)
! 			{
! 				logger.warn("An error we can't handle that's expected infrequently. "+e.getMessage());
! 			}
! 			else
! 			{
! 				logger.error("Unexpected error. qs=" + request.getQueryString(), e);
! 				response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
! 			}
  		}
  	}