From 706b2b8abafe66e6af53120b422d6b49a277f23d Mon Sep 17 00:00:00 2001
From: ghidravore <ghidravore@users.noreply.github.com>
Date: Wed, 5 Aug 2020 16:34:25 -0400
Subject: [PATCH] fixed hashcode method in ColumnTypeMapper to handle null
 source types

---
 .gitattributes                                                 | 3 +--
 .../docking/widgets/table/constraint/ColumnTypeMapper.java     | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index dfbc8373f1..04b1ff2926 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,7 +15,6 @@
 *.jspf text
 *.jspx text
 *.properties text
-*.sh text
 *.tld text
 *.txt text
 *.tag text
@@ -52,5 +51,5 @@
 *.gzf binary
 *.tgz binary
 *.tar binary
-
+*.sh binary
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java
index cdfbd94061..7f7101ed98 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java
@@ -16,6 +16,7 @@
 package docking.widgets.table.constraint;
 
 import java.util.List;
+import java.util.Objects;
 
 import docking.widgets.table.constraint.provider.NumberColumnConstraintProvider;
 import ghidra.util.classfinder.ExtensionPoint;
@@ -60,7 +61,7 @@ public abstract class ColumnTypeMapper<T, M> implements ExtensionPoint {
 
 	@Override
 	public int hashCode() {
-		return sourceType.hashCode() + destinationType.hashCode();
+		return Objects.hash(sourceType, destinationType);
 	}
 
 	@Override