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 2024/06/11 07:15:43 UTC
(httpcomponents-core) branch master updated (8ebf85e90 -> 75d74ce3b)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
discard 8ebf85e90 Javadoc
discard 7daeaee97 Remove needless null comparisons
discard c1c09c844 Revert "Remove needless null comparisons"
discard e021da124 Remove needless null comparisons
new f09f41cb4 Remove needless null comparisons
new 75d74ce3b Javadoc
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8ebf85e90)
\
N -- N -- N refs/heads/master (75d74ce3b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
(httpcomponents-core) 01/02: Remove needless null comparisons
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit f09f41cb4ff267dab97828fa47ca0a598b829e0a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 10 11:02:04 2024 -0400
Remove needless null comparisons
(cherry picked from commit 7daeaee973d64062616b34f8bba7411288cef44a)
---
.../main/java/org/apache/hc/core5/http/impl/io/IncomingHttpEntity.java | 3 +--
.../main/java/org/apache/hc/core5/http/io/entity/BasicHttpEntity.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IncomingHttpEntity.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IncomingHttpEntity.java
index ee1228f89..91edff19f 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IncomingHttpEntity.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IncomingHttpEntity.java
@@ -38,7 +38,6 @@ import org.apache.hc.core5.function.Supplier;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
-import org.apache.hc.core5.http.io.entity.EmptyInputStream;
import org.apache.hc.core5.io.Closer;
class IncomingHttpEntity implements HttpEntity {
@@ -89,7 +88,7 @@ class IncomingHttpEntity implements HttpEntity {
@Override
public boolean isStreaming() {
- return content != null && content != EmptyInputStream.INSTANCE;
+ return content != null;
}
@Override
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/BasicHttpEntity.java b/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/BasicHttpEntity.java
index 730ac911a..937614575 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/BasicHttpEntity.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/BasicHttpEntity.java
@@ -93,7 +93,7 @@ public class BasicHttpEntity extends AbstractHttpEntity {
@Override
public final boolean isStreaming() {
- return this.content != null && this.content != EmptyInputStream.INSTANCE;
+ return this.content != null;
}
@Override
(httpcomponents-core) 02/02: Javadoc
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 75d74ce3bfa285a40f4cc40a391c632d93c294bf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 10 11:02:18 2024 -0400
Javadoc
(cherry picked from commit 8ebf85e90eb009cf2a165b258bc44cf5cf1e47ac)
---
.../main/java/org/apache/hc/core5/http/io/entity/EmptyInputStream.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/EmptyInputStream.java b/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/EmptyInputStream.java
index 294952bd9..6e38e00cb 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/EmptyInputStream.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/io/entity/EmptyInputStream.java
@@ -34,6 +34,9 @@ import java.io.InputStream;
*/
public final class EmptyInputStream extends InputStream {
+ /**
+ * Singleton instance of EmptyInputStream.
+ */
public static final EmptyInputStream INSTANCE = new EmptyInputStream();
private EmptyInputStream() {