Skip to content

Commit 938e087

Browse files
committed
Revert "MINOR: Bump com.google.protobuf:protobuf-bom from 3.25.5 to 4.30.0 (apache#666)"
This reverts commit d13f0e0.
1 parent 7f51b55 commit 938e087

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public AuthObserver() {
7676
@Override
7777
public void onNext(HandshakeResponse value) {
7878
ByteString payload = value.getPayload();
79-
messages.add(payload.toByteArray());
79+
if (payload != null) {
80+
messages.add(payload.toByteArray());
81+
}
8082
}
8183

8284
private Iterator<byte[]> iter =

flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ public AuthObserver(StreamObserver<HandshakeResponse> responseObserver) {
8484
@Override
8585
public void onNext(HandshakeRequest value) {
8686
ByteString payload = value.getPayload();
87-
messages.add(payload.toByteArray());
87+
if (payload != null) {
88+
messages.add(payload.toByteArray());
89+
}
8890
}
8991

9092
private Iterator<byte[]> iter =

flight/flight-integration-tests/src/shade/LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ License: https://www.apache.org/licenses/LICENSE-2.0
272272

273273
--------------------------------------------------------------------------------
274274

275-
This binary artifact contains Google Protobuf 4.30.2.
275+
This binary artifact contains Google Protobuf 3.25.5.
276276

277277
Copyright: Copyright 2008 Google Inc. All rights reserved.
278278
Home page: https://protobuf.dev/
279-
License: https://github.com/protocolbuffers/protobuf/blob/v4.30.1/LICENSE (BSD)
279+
License: https://github.com/protocolbuffers/protobuf/blob/v3.25.5/LICENSE (BSD)
280280
License text:
281281

282282
| Copyright 2008 Google Inc. All rights reserved.

flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ License: https://www.apache.org/licenses/LICENSE-2.0
234234

235235
--------------------------------------------------------------------------------
236236

237-
This binary artifact contains Protobuf 4.30.2.
237+
This binary artifact contains Protobuf 3.25.5.
238238

239239
Copyright: Copyright 2008 Google Inc. All rights reserved.
240240
Home page: https://protobuf.dev/
241-
License: https://github.com/protocolbuffers/protobuf/blob/v4.30.1/LICENSE (BSD)
241+
License: https://github.com/protocolbuffers/protobuf/blob/v3.25.3/LICENSE (BSD)
242242
License text:
243243

244244
| Copyright 2008 Google Inc. All rights reserved.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ under the License.
100100
<dep.guava-bom.version>33.4.8-jre</dep.guava-bom.version>
101101
<dep.netty-bom.version>4.2.9.Final</dep.netty-bom.version>
102102
<dep.grpc-bom.version>1.79.0</dep.grpc-bom.version>
103-
<dep.protobuf-bom.version>4.33.4</dep.protobuf-bom.version>
103+
<dep.protobuf-bom.version>3.25.5</dep.protobuf-bom.version>
104104
<dep.jackson-bom.version>2.21.0</dep.jackson-bom.version>
105105
<dep.hadoop.version>3.4.3</dep.hadoop.version>
106106
<dep.fbs.version>25.2.10</dep.fbs.version>

0 commit comments

Comments
 (0)