You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by cr...@locus.apache.org on 2000/12/03 00:17:39 UTC

cvs commit: jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest ServletRequestGetCharacterEncoding_1TestServlet.java

craigmcc    00/12/02 15:17:38

  Modified:    src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest
                        ServletRequestGetCharacterEncoding_1TestServlet.java
  Log:
  Update the "if" logic in this test so that it will return an intelligible
  error report (rather than throwing NullPointerException) if the servlet
  container incorrectly returns null from ServletRequest.getCharacterEncoding().
  
  Revision  Changes    Path
  1.4       +3 -3      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java
  
  Index: ServletRequestGetCharacterEncoding_1TestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServletRequestGetCharacterEncoding_1TestServlet.java	2000/11/09 17:54:48	1.3
  +++ ServletRequestGetCharacterEncoding_1TestServlet.java	2000/12/02 23:17:37	1.4
  @@ -1,6 +1,6 @@
   /*
  - * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v 1.3 2000/11/09 17:54:48 santosh Exp $
  - * $Date: 2000/11/09 17:54:48 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v 1.4 2000/12/02 23:17:37 craigmcc Exp $
  + * $Date: 2000/12/02 23:17:37 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -81,7 +81,7 @@
   		String encoding = request.getCharacterEncoding();
   
   		// in client side we set it to null
  -		if(encoding.equals("ISO-8859-1") ) {
  +                if("ISO-8859-1".equals(encoding) ) {
   				out.println("ServletRequestGetCharacterEncoding_1Test test PASSED");
   		}// else wrong type of encoding
   		else {