You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by fm...@apache.org on 2007/12/10 08:27:09 UTC

svn commit: r602794 - /jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java

Author: fmeschbe
Date: Sun Dec  9 23:27:06 2007
New Revision: 602794

URL: http://svn.apache.org/viewvc?rev=602794&view=rev
Log:
JCR-1264 : Correctly test for character "t" (or "T") in If header parsing.
Also added a closing quote to the error message to get something like
...'t'... instead of ...'t...

Modified:
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java?rev=602794&r1=602793&r2=602794&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java Sun Dec  9 23:27:06 2007
@@ -370,7 +370,7 @@
 
                     // check whether t or T
                     not = reader.read();
-                    if (not !='t' || not != 'T') {
+                    if (not !='t' && not != 'T') {
                         logIllegalState("IfList-Not", not, "t", null);
                         break;
                     }
@@ -500,7 +500,7 @@
         String effString = (effChar < 0) ? "<EOF>" : String.valueOf((char) effChar);
 
         // log the error
-        log.error("logIllegalState: Unexpected character '"+effString+" in state "+state+", expected any of "+expChar);
+        log.error("logIllegalState: Unexpected character '"+effString+"' in state "+state+", expected any of "+expChar);
 
         // catch up if a reader is given
         if (reader != null && effChar >= 0) {