Browse Source

Merge branch '5.3.x'

pull/27550/head
Stephane Nicoll 3 years ago
parent
commit
d16574f807
  1. 5
      ci/pipeline.yml
  2. 4
      spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java

5
ci/pipeline.yml

@ -46,6 +46,11 @@ resource_types: @@ -46,6 +46,11 @@ resource_types:
source:
repository: springio/artifactory-resource
tag: 0.0.17
- name: github-release
type: registry-image
source:
repository: concourse/github-release-resource
tag: 1.5.5
- name: github-status-resource
type: registry-image
source:

4
spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -126,7 +126,7 @@ public class ByteArrayResource extends AbstractResource { @@ -126,7 +126,7 @@ public class ByteArrayResource extends AbstractResource {
*/
@Override
public int hashCode() {
return (byte[].class.hashCode() * 29 * this.byteArray.length);
return Arrays.hashCode(this.byteArray);
}
}

Loading…
Cancel
Save