mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-08 15:27:43 +02:00
java: fix NPE in SeaweedWrite and Makefile env var scope
- Add null check for HttpEntity in SeaweedWrite.multipartUpload() to prevent NPE when response.getEntity() returns null - Fix Makefile test target to properly export SEAWEEDFS_TEST_ENABLED by setting it on the same command line as mvn test - Update docker-compose commands to use V2 syntax (docker compose) for consistency with GitHub Actions workflow
This commit is contained in:
1 parent
9da70aa3dc
commit
fba36f8d1c
2 files changed
+10
-9
No files matched your search
@@ -2,6 +2,7 @@ package seaweedfs.client;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.protobuf.ByteString;
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
import org.apache.http.client.methods.HttpPost;
|
||||
import org.apache.http.entity.mime.HttpMultipartMode;
|
||||
@@ -192,9 +193,10 @@ public class SeaweedWrite {
|
||||
|
||||
try {
|
||||
if (response.getStatusLine().getStatusCode() / 100 != 2) {
|
||||
if (response.getEntity().getContentType() != null
|
||||
&& response.getEntity().getContentType().getValue().equals("application/json")) {
|
||||
throw new IOException(EntityUtils.toString(response.getEntity(), "UTF-8"));
|
||||
HttpEntity entity = response.getEntity();
|
||||
if (entity != null && entity.getContentType() != null
|
||||
&& entity.getContentType().getValue().equals("application/json")) {
|
||||
throw new IOException(EntityUtils.toString(entity, "UTF-8"));
|
||||
} else {
|
||||
throw new IOException(response.getStatusLine().getReasonPhrase());
|
||||
}
|
||||
|
||||
@@ -19,9 +19,8 @@ build:
|
||||
test:
|
||||
@if [ -z "$$SEAWEEDFS_TEST_ENABLED" ]; then \
|
||||
echo "Setting SEAWEEDFS_TEST_ENABLED=true"; \
|
||||
export SEAWEEDFS_TEST_ENABLED=true; \
|
||||
fi
|
||||
mvn test
|
||||
SEAWEEDFS_TEST_ENABLED=true mvn test
|
||||
|
||||
test-local:
|
||||
@echo "Testing against local SeaweedFS (localhost:8888)..."
|
||||
@@ -29,12 +28,12 @@ test-local:
|
||||
|
||||
test-docker:
|
||||
@echo "Running tests in Docker..."
|
||||
docker-compose up --build --abort-on-container-exit spark-tests
|
||||
docker-compose down
|
||||
docker compose up --build --abort-on-container-exit spark-tests
|
||||
docker compose down
|
||||
|
||||
docker-up:
|
||||
@echo "Starting SeaweedFS in Docker..."
|
||||
docker-compose up -d seaweedfs-master seaweedfs-volume seaweedfs-filer
|
||||
docker compose up -d seaweedfs-master seaweedfs-volume seaweedfs-filer
|
||||
@echo "Waiting for services to be ready..."
|
||||
@sleep 5
|
||||
@echo "SeaweedFS is ready!"
|
||||
@@ -43,7 +42,7 @@ docker-up:
|
||||
|
||||
docker-down:
|
||||
@echo "Stopping SeaweedFS Docker containers..."
|
||||
docker-compose down -v
|
||||
docker compose down -v
|
||||
|
||||
run-example:
|
||||
@echo "Running example application..."
|
||||
|
||||
Reference in new issue
Block a user