Merge branch 'master' of https://github.com/markb74/grpc-java

markb74 · markb74 · commit e08197597a93 · 2019-11-26T14:20:08.000Z
diff --git a/api/src/main/java/io/grpc/InternalMetadata.java b/api/src/main/java/io/grpc/InternalMetadata.java
@@ -19,6 +19,7 @@
 import com.google.common.io.BaseEncoding;
 import io.grpc.Metadata.AsciiMarshaller;
 import io.grpc.Metadata.Key;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 
 /**
diff --git a/api/src/test/java/io/grpc/MetadataTest.java b/api/src/test/java/io/grpc/MetadataTest.java
@@ -504,7 +504,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return name.hashCode();
+      return super.hashCode();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ public boolean equals(Object o) {`
`504`	`504`
`505`	`505`	`@Override`
`506`	`506`	`public int hashCode() {`
`507`		`- return name.hashCode();`
	`507`	`+ return super.hashCode();`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`@Override`