You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/02/27 22:35:15 UTC

svn commit: r1294339 - in /httpcomponents/httpcore/trunk/httpcore/src: main/java/org/apache/http/protocol/SyncBasicHttpContext.java test/java/org/apache/http/protocol/TestHttpExecutionContext.java

Author: olegk
Date: Mon Feb 27 21:35:14 2012
New Revision: 1294339

URL: http://svn.apache.org/viewvc?rev=1294339&view=rev
Log:
Deprecated SyncBasicHttpContext

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java?rev=1294339&r1=1294338&r2=1294339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java Mon Feb 27 21:35:14 2012
@@ -27,14 +27,14 @@
 
 package org.apache.http.protocol;
 
-import org.apache.http.annotation.ThreadSafe;
-
 /**
  * Thread-safe extension of the {@link BasicHttpContext}.
  *
  * @since 4.0
+ * 
+ * @deprecated HttpContext instances may not be shared by multiple threads
  */
-@ThreadSafe
+@Deprecated
 public class SyncBasicHttpContext extends BasicHttpContext {
 
     public SyncBasicHttpContext(final HttpContext parentContext) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java?rev=1294339&r1=1294338&r2=1294339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java Mon Feb 27 21:35:14 2012
@@ -36,8 +36,8 @@ public class TestHttpExecutionContext {
 
     @Test
     public void testContextOperations() {
-        HttpContext parentContext = new SyncBasicHttpContext(null);
-        HttpContext currentContext = new SyncBasicHttpContext(parentContext);
+        HttpContext parentContext = new BasicHttpContext(null);
+        HttpContext currentContext = new BasicHttpContext(parentContext);
 
         parentContext.setAttribute("param1", "1");
         parentContext.setAttribute("param2", "2");
@@ -66,7 +66,7 @@ public class TestHttpExecutionContext {
 
     @Test
     public void testEmptyContextOperations() {
-        HttpContext currentContext = new SyncBasicHttpContext(null);
+        HttpContext currentContext = new BasicHttpContext(null);
         Assert.assertEquals(null, currentContext.getAttribute("param1"));
         currentContext.removeAttribute("param1");
         Assert.assertEquals(null, currentContext.getAttribute("param1"));
@@ -74,7 +74,7 @@ public class TestHttpExecutionContext {
 
     @Test
     public void testContextInvalidInput() throws Exception {
-        HttpContext currentContext = new SyncBasicHttpContext(null);
+        HttpContext currentContext = new BasicHttpContext(null);
         try {
             currentContext.setAttribute(null, null);
             Assert.fail("IllegalArgumentException should have been thrown");