Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D8E351193A for ; Thu, 19 Jun 2014 15:17:19 +0000 (UTC) Received: (qmail 91701 invoked by uid 500); 19 Jun 2014 15:17:19 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 91662 invoked by uid 500); 19 Jun 2014 15:17:19 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 91653 invoked by uid 99); 19 Jun 2014 15:17:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 15:17:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 15:17:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA4822388868 for ; Thu, 19 Jun 2014 15:16:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603917 - /httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java Date: Thu, 19 Jun 2014 15:16:55 -0000 To: commits@hc.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140619151655.EA4822388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Thu Jun 19 15:16:55 2014 New Revision: 1603917 URL: http://svn.apache.org/r1603917 Log: Javadoc fixes for Java 8. Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java?rev=1603917&r1=1603916&r2=1603917&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/annotation/GuardedBy.java Thu Jun 19 15:16:55 2014 @@ -37,7 +37,9 @@ import java.lang.annotation.Target; * when holding a particular lock, which may be a built-in (synchronization) lock, * or may be an explicit java.util.concurrent.Lock. * + *

* The argument determines which lock guards the annotated field or method: + *

*
    *
  • * this : The intrinsic lock of the object in whose class the field is defined. @@ -63,10 +65,12 @@ import java.lang.annotation.Target; *
  • * class-name.class : The Class object for the specified class should be used as the lock object. *
  • + *
*

* Based on code developed by Brian Goetz and Tim Peierls and concepts * published in 'Java Concurrency in Practice' by Brian Goetz, Tim Peierls, * Joshua Bloch, Joseph Bowbeer, David Holmes and Doug Lea. + *

*/ @Documented @Target({ElementType.FIELD, ElementType.METHOD})