Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 53586 invoked from network); 13 Feb 2007 17:11:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2007 17:11:59 -0000 Received: (qmail 75391 invoked by uid 500); 13 Feb 2007 17:12:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 75300 invoked by uid 500); 13 Feb 2007 17:12:06 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 75291 invoked by uid 99); 13 Feb 2007 17:12:06 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Feb 2007 09:12:06 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Feb 2007 09:11:58 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4072A1A981A; Tue, 13 Feb 2007 09:11:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r507105 - in /jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav: client/methods/PollMethod.java header/TimeoutHeader.java Date: Tue, 13 Feb 2007 17:11:38 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070213171138.4072A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue Feb 13 09:11:36 2007 New Revision: 507105 URL: http://svn.apache.org/viewvc?view=rev&rev=507105 Log: Timeout value is not set properly Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/TimeoutHeader.java Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java?view=diff&rev=507105&r1=507104&r2=507105 ============================================================================== --- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java (original) +++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java Tue Feb 13 09:11:36 2007 @@ -20,6 +20,7 @@ import org.apache.jackrabbit.webdav.DavMethods; import org.apache.jackrabbit.webdav.DavServletResponse; import org.apache.jackrabbit.webdav.DavException; +import org.apache.jackrabbit.webdav.header.PollTimeoutHeader; import org.apache.jackrabbit.webdav.xml.DomUtil; import org.apache.jackrabbit.webdav.xml.ElementIterator; import org.apache.jackrabbit.webdav.observation.ObservationConstants; @@ -50,8 +51,7 @@ super(uri); setRequestHeader(ObservationConstants.HEADER_SUBSCRIPTIONID, subscriptionId); if (timeout > 0) { - setRequestHeader(ObservationConstants.HEADER_POLL_TIMEOUT, - String.valueOf(timeout)); + setRequestHeader(new PollTimeoutHeader(timeout)); } } Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/TimeoutHeader.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/TimeoutHeader.java?view=diff&rev=507105&r1=507104&r2=507105 ============================================================================== --- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/TimeoutHeader.java (original) +++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/TimeoutHeader.java Tue Feb 13 09:11:36 2007 @@ -40,7 +40,11 @@ } public String getHeaderValue() { - return String.valueOf(timeout); + if (timeout == INFINITE_TIMEOUT) { + return TIMEOUT_INFINITE; + } else { + return "Second-" + (timeout / 1000); + } } public long getTimeout() { @@ -67,7 +71,7 @@ * into a long indicating the number of milliseconds until expiration time * is reached.
* NOTE: If the timeout String equals to {@link #TIMEOUT_INFINITE 'infinite'} - * {@link Long#MAX_VALUE} is returned. If the Sting is invalid or is in an + * {@link Integer#MAX_VALUE} is returned. If the Sting is invalid or is in an * invalid format that cannot be parsed, the default value is returned. * * @param timeoutStr