Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller
2019-07-30 17:34:29 +02:00
16 changed files with 87 additions and 43 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 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.
@@ -178,7 +178,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
*/
@Override
public int hashCode() {
return super.hashCode() * 31 + this.resourceBasePath.hashCode();
return (31 * super.hashCode() + this.resourceBasePath.hashCode());
}
/**